Changeset 326 for trunk/nom/class_c

Timestamp:

Apr 9, 2008, 10:22:08 PM (17 years ago)

Author:

cinc

Message:

Portability patches for Windows, Linux, Darwin by Bird.

Location:

trunk/nom/class_c

Files:

• Makefile.kup (added)
• nomclassmanager.c (modified) (8 diffs)
• nomcls.c (modified) (13 diffs)
• nomobj.c (modified) (4 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;
 

trunk/nom/class_c/nomcls.c

@@ -40 +40 @@
 #endif
 
-#define INCL_DOS
-#include <os2.h>
+#ifdef __OS2__
+# define INCL_DOS
+# include <os2.h>
+#endif /* __OS2__ */
+
 #include <string.h>
 #include <stdlib.h>
-#include <gtk/gtk.h>
+#ifdef NOM_WITH_GTK
+# include <gtk/gtk.h>
+#endif 
 
 
@@ -64 +69 @@
   if(nomIsObj(nObj)){
     //nomPrintf("Finalizing 0x%x: %s \n", nObj, nObj->mtab->nomClassName);
-    _nomUnInit(nObj, NULLHANDLE);
+    _nomUnInit(nObj, NULL);
   }
   //else
@@ -80 +85 @@
 
   if(!_ncpObject)
-    return NULLHANDLE;
+    return NULL;
 
   ncp=(NOMClassPriv*)_ncpObject;
@@ -86 +91 @@
   /* Allocate memory big enough to hold an object. This means the size is that of the
      mtab pointer and all instance variables. */
-  if((nObj=_nomAllocate(nomSelf, ncp->mtab->ulInstanceSize, NULLHANDLE))==NULLHANDLE)
-    return NULLHANDLE;
+  if((nObj=_nomAllocate(nomSelf, ncp->mtab->ulInstanceSize, NULL))==NULL)
+    return NULL;
 
   /* _nomInit() is called in _nomRenew() */
-  return _nomRenew(nomSelf, (CORBA_Object)nObj, NULLHANDLE); /* This will also init the object */
+  return _nomRenew(nomSelf, (CORBA_Object)nObj, NULL); /* This will also init the object */
 }
 
@@ -135 +140 @@
   tempEnv.fFlags=NOMENV_FLG_DONT_CHECK_OBJECT;
 #endif
-  _nomRenewNoInit(nomSelf, nomObj, NULLHANDLE);
+  _nomRenewNoInit(nomSelf, nomObj, NULL);
 
   /* And now give the object the possibility to initialize... */
   /* Make sure the object is not checked. */
   //_nomInit((NOMObject*)nomObj, &tempEnv);
-  _nomInit((NOMObject*)nomObj, NULLHANDLE);
+  _nomInit((NOMObject*)nomObj, NULL);
 
   return nomObj;
@@ -165 +170 @@
 
   /* The private struct characterizing the objects this meta class can create. */
-  ncp=_nomGetObjectCreateInfo(nomSelf, NULLHANDLE);
+  ncp=_nomGetObjectCreateInfo(nomSelf, NULL);
 
   if(!ncp)
@@ -231 +236 @@
       
       //The following was used before changing nomGetname()
-      //if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetName(nomSelf, NULLHANDLE),
-      //                        0, 0, NULLHANDLE))
+      //if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetName(nomSelf, NULL),
+      //                        0, 0, NULL))
       if(!_nomFindClassFromName(NOMClassMgrObject, _nomGetClassName(nomSelf, &tempEnv),
                               0, 0, &tempEnv))
@@ -246 +251 @@
           //ncPriv->ulIsMetaClass=1; /* Mark that we are a metaclass */
           ncPriv->ulClassFlags|=NOM_FLG_IS_METACLASS; /* Mark that we are a metaclass */
-          _nomRegisterClass(NOMClassMgrObject, nomSelf->mtab, NULLHANDLE);
+          _nomRegisterClass(NOMClassMgrObject, nomSelf->mtab, NULL);
           /* Register all the methods this class introduces */
           ulNumIntroducedMethods=ncPriv->sci->ulNumStaticMethods;
@@ -253 +258 @@
               if(*ncPriv->sci->nomSMethods[a].chrMethodDescriptor)
                 _nomRegisterMethod(NOMClassMgrObject, nomSelf->mtab,
-                                   *ncPriv->sci->nomSMethods[a].chrMethodDescriptor, NULLHANDLE);
+                                   *ncPriv->sci->nomSMethods[a].chrMethodDescriptor, NULL);
             }
           /* Metaclass is registered. Register the object class this
              metaclass may create. */
-          ncPriv=(NOMClassPriv*)_nomGetObjectCreateInfo(nomSelf, NULLHANDLE);//nomSelf->mtab->nomClsInfo;
+          ncPriv=(NOMClassPriv*)_nomGetObjectCreateInfo(nomSelf, NULL);//nomSelf->mtab->nomClsInfo;
           if(ncPriv){
+#ifndef _MSC_VER
 #warning !!!!! NOMClass does not have this pointer, this is a bug !!!!!
+#endif
             //ncPriv->ulIsMetaClass=0; /* Mark that we are not a metaclass (should be 0 already) */
             ncPriv->ulClassFlags&=~NOM_FLG_IS_METACLASS; /* Mark that we are not a metaclass (should be 0 already) */
-            _nomRegisterClass(NOMClassMgrObject, ncPriv->mtab, NULLHANDLE);
+            _nomRegisterClass(NOMClassMgrObject, ncPriv->mtab, NULL);
 
             /* Register all the methods this class introduces */
@@ -270 +277 @@
                 if(*ncPriv->sci->nomSMethods[a].chrMethodDescriptor)
                   _nomRegisterMethod(NOMClassMgrObject, ncPriv->mtab,
-                                     *ncPriv->sci->nomSMethods[a].chrMethodDescriptor, NULLHANDLE);
+                                     *ncPriv->sci->nomSMethods[a].chrMethodDescriptor, NULL);
               }/* for(a) */
           }/* ncPriv */
@@ -281 +288 @@
         nomPrintf("%s: Metaclass already registered, registering normal object class now.\n", __FUNCTION__);
 
-        ncPriv=(NOMClassPriv*)_nomGetObjectCreateInfo(nomSelf, NULLHANDLE);//nomSelf->mtab->nomClsInfo;
+        ncPriv=(NOMClassPriv*)_nomGetObjectCreateInfo(nomSelf, NULL);//nomSelf->mtab->nomClsInfo;
         // ncPriv->ulIsMetaClass=0; /* Mark that we are not a metaclass (should be 0 already) */
         ncPriv->ulClassFlags&=~NOM_FLG_IS_METACLASS; /* Mark that we are not a metaclass (should be 0 already) */
@@ -292 +299 @@
               if(*ncPriv->sci->nomSMethods[a].chrMethodDescriptor)
                 _nomRegisterMethod(NOMClassMgrObject, ncPriv->mtab,
-                                   *ncPriv->sci->nomSMethods[a].chrMethodDescriptor, NULLHANDLE);
+                                   *ncPriv->sci->nomSMethods[a].chrMethodDescriptor, NULL);
             }
           //nomPrintf("%s %s \n", nomSelf->mtab->nomClassName, ncPriv->mtab->nomClassName);
-          _nomRegisterClass(NOMClassMgrObject, ncPriv->mtab, NULLHANDLE);
+          _nomRegisterClass(NOMClassMgrObject, ncPriv->mtab, NULL);
         }
       }
@@ -316 +323 @@
   /* Don't check object pointer. We are just created but not yet registered as a class. */
   //  NOMClass_nomInit_parent(nomSelf,  &tempEnv);
-  NOMClass_nomInit_parent(nomSelf, NULLHANDLE);
-}
-
-
-
-
+  NOMClass_nomInit_parent(nomSelf, NULL);
+}
+
+
+
+

trunk/nom/class_c/nomobj.c

@@ -41 +41 @@
 #endif
 
-#define INCL_DOS
-#include <os2.h>
+#ifdef __OS2__
+# define INCL_DOS
+# include <os2.h>
+#endif /* __OS2__ */
+
 #include <string.h>
-#include <gtk/gtk.h>
+/* #include <gtk/gtk.h> - why? */
 
 #include "nom.h"
@@ -110 +113 @@
 
   /* Give object the chance to free resources */
-  _nomUnInit(nomSelf, NULLHANDLE);
+  _nomUnInit(nomSelf, NULL);
 
   /* And now delete the object */
@@ -155 +158 @@
      It is possible that we are called by a subclass. So get the class object and let the
      class object create the correct class. */
-  nomCls=NOMObject_nomGetClass(nomSelf, NULLHANDLE);
-  return NOMClass_nomNew(nomCls, NULLHANDLE);
+  nomCls=NOMObject_nomGetClass(nomSelf, NULL);
+  return NOMClass_nomNew(nomCls, NULL);
 }
 
@@ -203 +206 @@
   }
  
-  if(nomClass==_nomGetClass(nomSelf, NULLHANDLE))
+  if(nomClass==_nomGetClass(nomSelf, NULL))
     return TRUE;