Changeset 326 for trunk/nom/class_c/nomclassmanager.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/class_c/nomclassmanager.c (modified) (8 diffs)

trunk/nom/class_c/nomclassmanager.c

@@ -44 +44 @@
 #endif
 
-#define INCL_DOS
-#include <os2.h>
+#ifdef __OS2__
+# define INCL_DOS
+# include <os2.h>
+#endif /* __OS2__ */
+
 #include <string.h>
-#include <gtk/gtk.h>
+#ifdef NOM_WITH_GTK
+# include <gtk/gtk.h>
+#endif
 
 
@@ -85 +90 @@
                                                                   CORBA_Environment *ev)
 {
-  CORBA_Object nomRetval=NULLHANDLE;
+  CORBA_Object nomRetval=NULL;
   nomMethodTab * mtab;
   NOMClassMgrData *nomThis = NOMClassMgrGetData(nomSelf);
@@ -91 +96 @@
   /* This is only for NOMClass objects */
   if(strchr(className, ':'))
-    return NULLHANDLE;
+    return NULL;
 
   mtab=g_datalist_get_data(&_gdataClassList, className);
@@ -164 +169 @@
   /* This is only for NOMClassPriv objects */
   if(strchr(className, ':'))
-    return NULLHANDLE;
+    return NULL;
 
   mtab=g_datalist_get_data(&_gdataClassList, className);
@@ -170 +175 @@
     return mtab->nomClsInfo;
   else
-    return NULLHANDLE;
+    return NULL;
 }
 
@@ -214 +219 @@
   NOMClassMgrData* nomThis=NOMClassMgrGetData(nomSelf);
 
-  if(NULLHANDLE==nomObject)
+  if(NULL==nomObject)
     return FALSE;
 
-  return (g_tree_lookup(_pClassListTree, nomObject->mtab)!= NULLHANDLE); 
+  return (g_tree_lookup(_pClassListTree, nomObject->mtab)!= NULL); 
 }
 
@@ -234 +239 @@
 
   /* This returns a meta class */
-  if((oClass=_nomFindClassFromName( nomSelf, oldClass, 0, 0, NULLHANDLE))==NULLHANDLE)
+  if((oClass=_nomFindClassFromName( nomSelf, oldClass, 0, 0, NULL))==NULL)
     return FALSE;
 
-  if((rClass=_nomFindClassFromName( nomSelf, replacementClass, 0, 0, NULLHANDLE))==NULLHANDLE)
+  if((rClass=_nomFindClassFromName( nomSelf, replacementClass, 0, 0, NULL))==NULL)
     return FALSE;
 
   /* Check if the class is a direct child */
-  ncp=(NOMClassPriv*)_nomGetObjectCreateInfo(rClass, NULLHANDLE);
+  ncp=(NOMClassPriv*)_nomGetObjectCreateInfo(rClass, NULL);
   
   if(strcmp(ncp->parentMtabStruct.next->mtab->nomClassName, oldClass))
@@ -269 +274 @@
     return NULL;
 
-  if((thePath=NOMPathNew())==NULLHANDLE)
+  if((thePath=NOMPathNew())==NULL)
     return NULL;