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

trunk/nom/src/nombuildnomcls.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>
 
@@ -63 +65 @@
     #define BUILDNOMCLASS_ENTER
     #define BUILDNOMCLASS_LEAVE
+#   ifdef _MSC_VER 
+void _inline DBG_BUILDNOMCLASS(gboolean a, const char *msg, ...)
+{
+    /* sorry, nothing here. */
+}
+#   else
     #define DBG_BUILDNOMCLASS(a, b,...)
+#   endif
 #endif
 
@@ -71 +80 @@
 
 extern PNOM_ENV pGlobalNomEnv;
-extern ULONG thunk[];
-extern ULONG mThunkCode[];
+extern gulong thunk[];
+extern gulong mThunkCode[];
 
 /********************************************************/
@@ -119 +128 @@
 
   /* Alloc private class struct using SOMCalloc. */
-  if((nClass=(NOMClassPriv*)NOMCalloc(1, gulMemSize))==NULLHANDLE)
-    return NULLHANDLE;
+  if((nClass=(NOMClassPriv*)NOMCalloc(1, gulMemSize))==NULL)
+    return NULL;
 
   /* Get mem for method thunking code. This assembler code is needed so the indirect
@@ -132 +141 @@
     if(!nClass->mThunk) {
       NOMFree(nClass);
-      return NULLHANDLE;
+      return NULL;
     }
   }
@@ -150 +159 @@
   if(!addMethodAndDataToThisPrivClassStruct( nClass, ncpParent, sci)){
     NOMFree(nClass);
-    return NULLHANDLE;
+    return NULL;
   };
 
@@ -158 +167 @@
   nClass->mtab->mtabSize=mtabSize;
   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+gulParentDataSize; /* Size of instance data of this class and all
@@ -205 +216 @@
   else{
     g_error("No NOMObject while trying to build NOMClass."); /* This will result in a termination of the app! */
-    return NULLHANDLE;                                       /* NOMClass *must* have an object as parent! 
+    return NULL;                                       /* NOMClass *must* have an object as parent! 
                                                                 We won't reach this point */ 
   }
@@ -223 +234 @@
 
   /* Build the NOMClassPriv for NOMClass */
-  if((nClass=buildNOMClassPrivStruct(sci, ncpParent))==NULLHANDLE)
-    return NULLHANDLE;
+  if((nClass=buildNOMClassPrivStruct(sci, ncpParent))==NULL)
+    return NULL;
 
   ulParentDataSize=ncpParent->mtab->ulInstanceSize; /* Parent instance size. This is the mtab pointer + instance vars */
@@ -231 +242 @@
   /* And now the NOMClass struct. A NOMClass has a mTab pointer at the beginning and the instance data
      following (including the parent instance data).*/
-  if((nomClass=(NOMClass*)NOMCalloc(1, sci->ulInstanceDataSize+ulParentDataSize))==NULLHANDLE) {
+  if((nomClass=(NOMClass*)NOMCalloc(1, sci->ulInstanceDataSize+ulParentDataSize))==NULL) {
     NOMFree(nClass->mThunk);
     NOMFree(nClass);
-    return NULLHANDLE;
+    return NULL;
   }
 
@@ -274 +285 @@
   pGlobalNomEnv->defaultMetaClass=nomClass;
 
+#ifndef _MSC_VER
 #warning !!!!! _nomSetInstanceSize() not called !!!!!
+#endif
 #if 0
   /* Set this class size into instance var */
@@ -281 +294 @@
 
   /* Run initialization code if any */
-  _nomInit(nomClass, NULLHANDLE);
+  _nomInit(nomClass, NULL);
   return nomClass;
 }