Changeset 326 for trunk/nom/include/nomtk.h

Timestamp:

Apr 9, 2008, 10:22:08 PM (17 years ago)

Author:

cinc

Message:

Portability patches for Windows, Linux, Darwin by Bird.

File:

• trunk/nom/include/nomtk.h (modified) (4 diffs)

trunk/nom/include/nomtk.h

@@ -46 +46 @@
 /* That's the base structure of all the SOM stuff */
 typedef struct _nomEnv {
-  ULONG cbSize;      /* Size of this struct */
-  PVOID pMemPool;    /* Shared memory heap for sub alloc */
+  gulong cbSize;      /* Size of this struct */
+  void *pMemPool;    /* Shared memory heap for sub alloc */
+#ifdef __OS2__
   HMTX  hmtx_obsolete;  /* Mutex sem to protect this structure -Will go away! */
-  ULONG ulNumRegIds; /* Number of registered somIDs */
+#else
+/* PORTME */
+#endif
+  gulong ulNumRegIds; /* Number of registered somIDs */
   NOMClassPriv  *ncpNOMObject;  /* This is for NOMObject*/
   nomClasses livingMetaClasses; /* List of created meta classes. */
@@ -65 +69 @@
 NOMEXTERN PNOM_ENV NOMLINK nomTkInit(void);
 
-NOMEXTERN nomToken NOMLINK NOMMalloc(const ULONG size);
+NOMEXTERN nomToken NOMLINK NOMMalloc(const gulong size);
 NOMEXTERN boolean NOMLINK NOMFree(const nomToken memPtr);
-NOMEXTERN nomToken NOMLINK  NOMCalloc(const ULONG num, const ULONG size);
+NOMEXTERN nomToken NOMLINK  NOMCalloc(const gulong num, const gulong size);
 //NOMEXTERN gboolean NOMLINK nomIsObj(NOMObject * nomObj);
 NOMEXTERN gboolean NOMLINK nomIsObj(gpointer nomObj);
@@ -80 +84 @@
 
 /* Functions used by nomBuildClass() */
-ULONG priv_requestSomEnvMutex(PNOM_ENV pEnv);
-ULONG priv_releaseSomEnvMutex(PNOM_ENV pEnv);
-BOOL priv_addPrivClassToGlobalClassList(PNOM_ENV pEnv, NOMClassPriv * nClass);
+gulong priv_requestSomEnvMutex(PNOM_ENV pEnv);
+gulong priv_releaseSomEnvMutex(PNOM_ENV pEnv);
+gboolean priv_addPrivClassToGlobalClassList(PNOM_ENV pEnv, NOMClassPriv * nClass);
 NOMClassPriv* priv_findPrivClassInGlobalClassListFromName(PNOM_ENV pEnv, char* nClass);
 
@@ -114 +118 @@
 #endif
 
-void _dumpClassDataStruct(nomClassDataStructure* cds, ULONG ulNumMethods);
+void _dumpClassDataStruct(nomClassDataStructure* cds, gulong ulNumMethods);
 void _dumpSci(nomStaticClassInfo* sci);
 void  _dumpMtab(nomMethodTab* mtab);