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

trunk/nom/src/nommemory.c

@@ -33 +33 @@
 * ***** END LICENSE BLOCK ***** */
 
-#define INCL_DOS
-#define INCL_DOSERRORS
-#define INCL_DOSMEMMGR
+#ifdef __OS2__
+# define INCL_DOS
+# define INCL_DOSERRORS
+# define INCL_DOSMEMMGR
+# include <os2.h>
+#endif /* __OS2__ */
 
-#include <os2.h>
 
 #include <string.h>
 #include <stdlib.h>
 
-#include <gtk/gtk.h>
+/* #include <gtk/gtk.h> - why? */
 #include <nom.h>
 #include <nomtk.h>
@@ -49 +51 @@
 extern gboolean bUseGC; /* Set during initialization */
 
-NOMEXTERN nomToken NOMLINK NOMMalloc(ULONG size)
+NOMEXTERN nomToken NOMLINK NOMMalloc(const gulong size)
 {
   gchar* memPtr;
 
-  if((memPtr=g_malloc(size))==NULLHANDLE)
-    return NULLHANDLE;
+  if((memPtr=g_malloc(size))==NULL)
+    return NULL;
 
   return (nomToken) memPtr;
@@ -61 +63 @@
   PULONG memPtr;
 
-  if((memPtr=g_malloc(size+sizeof(gpointer)))==NULLHANDLE)
-    return NULLHANDLE;
+  if((memPtr=g_malloc(size+sizeof(gpointer)))==NULL)
+    return NULL;
 
   *memPtr=size;
@@ -70 +72 @@
 }
 
-nomToken NOMLINK NOMCalloc(const ULONG num, const ULONG size)
+nomToken NOMLINK NOMCalloc(const gulong num, const gulong size)
 {
   gchar* memPtr;
 
-  if((memPtr=g_malloc(size*num ))==NULLHANDLE)
-    return NULLHANDLE; /* We won't end here because GLib just terminates the process :-/ 
+  if((memPtr=g_malloc(size*num ))==NULL)
+    return NULL; /* We won't end here because GLib just terminates the process :-/ 
                           A really sick idea imho. */
   if(!bUseGC)
@@ -85 +87 @@
   PULONG memPtr;
 
-  if((memPtr=g_malloc(size*num + sizeof(ULONG)))==NULLHANDLE)
-    return NULLHANDLE; /* We won't end here because GLib just terminates the process :-/ 
+  if((memPtr=g_malloc(size*num + sizeof(gulong)))==NULL)
+    return NULL; /* We won't end here because GLib just terminates the process :-/ 
                           A really sick idea imho. */
   if(!bUseGC)
-    memset(memPtr, 0, size*num + sizeof(ULONG)); /* GC always returns zeroed memory */
+    memset(memPtr, 0, size*num + sizeof(gulong)); /* GC always returns zeroed memory */
 
   *memPtr=size;
@@ -103 +105 @@
 {
 #if 0
-  ULONG* pul=(PULONG)memPtr;
+  gulong* pul=(PULONG)memPtr;
 
   pul--;