Changeset 326 for trunk/nom/src/nomdebug.c

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/src/nomdebug.c (modified) (12 diffs)

trunk/nom/src/nomdebug.c

@@ -33 +33 @@
 * ***** END LICENSE BLOCK ***** */
 
-#define INCL_DOS
-#define INCL_DOSFILEMGR
-#define INCL_DOSERRORS
-#define INCL_WIN
-#define INCL_WINWORKPLACE
-#define INCL_OS2MM
-#define INCL_MMIOOS2
-#define INCL_MCIOS2
-#define INCL_GPI
-#define INCL_PM
-
-#include <os2.h>
+#ifdef __OS2__
+# define INCL_DOS
+# define INCL_DOSFILEMGR
+# define INCL_DOSERRORS
+# define INCL_WIN
+# define INCL_WINWORKPLACE
+# define INCL_OS2MM
+# define INCL_MMIOOS2
+# define INCL_MCIOS2
+# define INCL_GPI
+# define INCL_PM
+# include <os2.h>
+#endif /* __OS2__ */
+
 #include <stdarg.h>
 #include <stdio.h>
@@ -65 +67 @@
       g_error("The object used to call the method %s is not a valid NOM object. ", chrMethodName);
     else
-      g_error("The object for which the method %s should be called is not valid for this method.\nThe object must be some instance of class %s (or of a subclass) but is a %s.", chrMethodName, NOMClass_nomGetCreatedClassName(nomClass, NULLHANDLE), 
-                NOMObject_nomGetClassName(nomObject, NULLHANDLE));
+      g_error("The object for which the method %s should be called is not valid for this method.\nThe object must be some instance of class %s (or of a subclass) but is a %s.", chrMethodName, NOMClass_nomGetCreatedClassName(nomClass, NULL), 
+                NOMObject_nomGetClassName(nomObject, NULL));
   }
 }
@@ -114 +116 @@
 
   //  g_message("In %s with %s %px nomClass: %px (%s)", __FUNCTION__, chrMethodName, nomSelf, nomClass, nomClass->mtab->nomClassName);
-  if(!nomIsObj(nomSelf) || !_nomIsANoClsCheck(nomSelf, nomClass, NULLHANDLE))
+  if(!nomIsObj(nomSelf) || !_nomIsANoClsCheck(nomSelf, nomClass, NULL))
     {
       nomPrintObjectPointerErrorMsg(nomSelf, nomClass, chrMethodName);
@@ -154 +156 @@
   nomPrintf("----- %s -----  NOMClassMgrObject: %lx\n", __FUNCTION__, NOMClassMgrObject);
 
-  pgdata=_nomGetClassList(NOMClassMgrObject, NULLHANDLE);
+  pgdata=_nomGetClassList(NOMClassMgrObject, NULL);
   if(pgdata){
     nomPrintf("%s: classlist: %lx\n", __FUNCTION__, pgdata);
@@ -176 +178 @@
     nomPrintf("explicitMetaId (meta class): %s\n", *sci->nomExplicitMetaId);
   else
-    nomPrintf("explicitMetaId (meta class): NULLHANDLE\n");
+    nomPrintf("explicitMetaId (meta class): NULL\n");
   //  somPrintf("*parents: 0x%x\n", sci->parents);
   nomPrintf("somClassDataStructure cds: 0x%x\n",sci->nomCds);
@@ -190 +192 @@
 
 
-void _dumpClassDataStruct(nomClassDataStructure* cds, ULONG ulNumMethods)
+void _dumpClassDataStruct(nomClassDataStructure* cds, gulong ulNumMethods)
 {
   int a;
@@ -215 +217 @@
   nomPrintf("  instanceSize (this and all parents): %d 0x%x\n", mtab->ulInstanceSize, mtab->ulInstanceSize);
   nomPrintf("  mtabSize: %d 0x%x\n", mtab->mtabSize, mtab->mtabSize);
-  nomPrintf("  somMethodProcs: (%ld)\n", (mtab->mtabSize-(LONG)sizeof(nomMethodTab))/4);
+  nomPrintf("  somMethodProcs: (%ld)\n", (mtab->mtabSize-(glong)sizeof(nomMethodTab))/4);
   //  entries=sObj->mtab->entries[0];
    for(a=0; a<=(mtab->mtabSize-sizeof(nomMethodTab))/4; a++)
@@ -234 +236 @@
   nomPrintf("*classInfo: 0x%x\n", *sObj->mtab->nomClsInfo);
 
-  so=(ULONG*)sObj->mtab->classInfo;
+  so=(gulong*)sObj->mtab->classInfo;
 #endif
   nomPrintf("className: %s\n", sObj->mtab->nomClassName);
@@ -249 +251 @@
 
 #if 0
-void _dumpStaticMTab(somStaticMethod_t* smt, ULONG ulMethod)
+void _dumpStaticMTab(somStaticMethod_t* smt, gulong ulMethod)
 {
   somStaticMethod_t* tmpSmt=&smt[ulMethod];
@@ -262 +264 @@
 }
 
-void _dumpOverrideMTab(somOverrideMethod_t* omt, ULONG ulMethod)
+void _dumpOverrideMTab(somOverrideMethod_t* omt, gulong ulMethod)
 {
   somOverrideMethod_t* tmpOmt=&omt[ulMethod];
@@ -300 +302 @@
       tempPtr=(void*)tempPtr->next->mtab;
     else
-      tempPtr=NULLHANDLE;
+      tempPtr=NULL;
   }
 
@@ -400 +402 @@
   somPrintf("  instanceSize (this and all parents): %d 0x%x\n", sObj->mtab->instanceSize, sObj->mtab->instanceSize);
   somPrintf("  mtabSize: %d 0x%x\n", sObj->mtab->mtabSize, sObj->mtab->mtabSize);
-  somPrintf("  somMethodProcs: (%ld)\n", (sObj->mtab->mtabSize-(LONG)sizeof(somMethodTab))/4);
+  somPrintf("  somMethodProcs: (%ld)\n", (sObj->mtab->mtabSize-(glong)sizeof(somMethodTab))/4);
   //  entries=sObj->mtab->entries[0];
    for(a=0; a<=(sObj->mtab->mtabSize-sizeof(somMethodTab))/4; a++)