Changeset 326 for trunk/nom/src/nombuildnomobj.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/nombuildnomobj.c (modified) (12 diffs)

trunk/nom/src/nombuildnomobj.c

@@ -33 +33 @@
 * ***** END LICENSE BLOCK ***** */
 
-#define INCL_DOS
-#define INCL_DOSERRORS
-
-#include <os2.h>
+#ifdef __OS2__
+# define INCL_DOS
+# define INCL_DOSERRORS
+# include <os2.h>
+#endif /* __OS2__ */
+
 #include <stdio.h>
 #include <string.h>
@@ -67 +69 @@
 */
 
-static ULONG thunk[]={0x0424448b, 0x00000405, 0x0000c300};
+static gulong thunk[]={0x0424448b, 0x00000405, 0x0000c300};
 
 /*
@@ -74 +76 @@
 JMP DWORD PTR [EDX+0ACh]  : JMP to address pointing to by EDX+0ACh
  */
-static ULONG mThunkCode[]={0x04244c8b, 0xff00518b, 0x0000aca2 , 0x16000000};
+static gulong mThunkCode[]={0x04244c8b, 0xff00518b, 0x0000aca2 , 0x16000000};
 
 /********************************************************/
@@ -100 +102 @@
   gulong mtabSize;
   gulong ulMemSize=0;
-  BYTE * mem;
+  guint8 * mem;
   int a;
 
@@ -116 +118 @@
   
   /* Alloc private class struct using NOMCalloc. */
-  if((nClass=(NOMClassPriv*)NOMCalloc(1, ulMemSize))==NULLHANDLE)
-    return NULLHANDLE;
+  if((nClass=(NOMClassPriv*)NOMCalloc(1, ulMemSize))==NULL)
+    return NULL;
   
 
@@ -138 +140 @@
   nClass->mtab->mtabSize=mtabSize;        /* This mtab is the same as the one used in the public NOMClass */
   nClass->mtab->nomClsInfo=(nomClassInfo*)nClass;        /* Hold a pointer to the private data that is this NOMClassPriv */
+#ifndef _MSC_VER
 #warning !!!!! Change this when nomId is a GQuark !!!!!
+#endif
   nClass->mtab->nomClassName=*sci->nomClassId;
   nClass->mtab->ulInstanceSize=sci->ulInstanceDataSize+sizeof(nomMethodTabPtr); /* sizeof(methodTabStruct*) + size of instance data of this class
@@ -151 +155 @@
     if(!nClass->mThunk) {
       NOMFree(nClass);
-      return NULLHANDLE; 
+      return NULL; 
     }
   }
@@ -172 +176 @@
     /* Now finally put the thunking in so the procedures are resolved correctly. */
     for(a=0;a<sci->ulNumStaticMethods;a++) {
-      ULONG ulOffset;
+      gulong ulOffset;
 
       memcpy(&nClass->mThunk[a], mThunkCode, sizeof(mThunkCode));               /* Copy method thunking code template  */
-      ulOffset=(ULONG)((char*)(mem+sizeof(NOMClass*))-(char*)nClass->mtab);     /* Skip priv class data pointer        */
+      ulOffset=(gulong)((char*)(mem+sizeof(NOMClass*))-(char*)nClass->mtab);     /* Skip priv class data pointer        */
       nClass->mThunk[a].thunk[2]=((ulOffset+a*sizeof(nomMethodProc*))<<8)+0xa2; /* Calculate offset for assembler code */
 #ifdef DEBUG_BUILDNOMOBJECT
@@ -202 +206 @@
 {
   NOMClassPriv *nClassPriv; /* This struct holds our private data. A pointer will be in mtab->nomClsInfo */
-  ULONG ulParentDataSize=0;
+  gulong ulParentDataSize=0;
 
 #ifdef DEBUG_BUILDNOMOBJECT
@@ -210 +214 @@
 
   /* Note: NOMObject has no parents */
-  if((nClassPriv=buildNOMClassPrivStructForNOMObject(sci))==NULLHANDLE)
-    return NULLHANDLE;
+  if((nClassPriv=buildNOMClassPrivStructForNOMObject(sci))==NULL)
+    return NULL;
 
 #ifdef DEBUG_BUILDNOMOBJECT
@@ -221 +225 @@
   sci->ccds->parentMtab->mtab=nClassPriv->mtab;         /* This class mtab                               */
   sci->ccds->parentMtab->next=NULL;                     /* We dont have parents because we are NOMObject */
-  sci->ccds->parentMtab->nomClassObject=NULLHANDLE;     /* NOMClass* Class object. We don't have one yet */
+  sci->ccds->parentMtab->nomClassObject=NULL;     /* NOMClass* Class object. We don't have one yet */
   sci->ccds->parentMtab->ulInstanceSize=nClassPriv->mtab->ulInstanceSize;
   /* C Class data structure */
@@ -267 +271 @@
 
   /* Run initialization code if any */
-  _nomInit((NOMObject*)nClassPriv, NULLHANDLE);
-  return NULLHANDLE;
+  _nomInit((NOMObject*)nClassPriv, NULL);
+  return NULL;
 }