Changeset 139 for trunk/nom/include/nom.h

Timestamp:

Dec 3, 2006, 11:25:38 AM (19 years ago)

Author:

cinc

Message:

Only use GLib types.

File:

• trunk/nom/include/nom.h (modified) (4 diffs)

trunk/nom/include/nom.h

@@ -83 +83 @@
 #endif
 
-typedef char integer1;
-typedef short integer2;
-typedef unsigned short uinteger2;
-typedef long integer4;
-typedef unsigned long uinteger4;
-typedef float float4;
-typedef double float8;
-typedef char *zString;                 /* NULL terminated string */
-typedef char *fString;                 /* non-terminated string  */
-typedef unsigned char octet;
-
 typedef gchar *string;
 
@@ -120 +109 @@
 typedef GQuark nomId;
 
-typedef GData* pGData;
+typedef GData* PGData;
 
-typedef char **nomID;                  
-typedef void *nomToken;                /*  */
+typedef gchar **nomID;                  
+typedef void *nomToken;                /* Use a gpointer instead of void* here?  */
 
 #ifndef NOM_BOOLEAN
@@ -131 +120 @@
 
 
-
-/* somtypes.h */
 /*  Object Instance Structure */
 struct nomMethodTabStruct;
 typedef struct NOMAnyObj_struct {
   struct nomMethodTabStruct  *mtab;
-  integer4 body[1];
+  gulong body[1];
 } NOMAnyObj;
 
@@ -147 +134 @@
 typedef NOMObject *CORBA_Object;
 
+/* The following is probably not correct... */
 typedef NOMAnyObj CORBA_Environment;
 
- /*#define nomresolve_(obj,mToken) (nomresolve(obj,mToken)) */
-
 #define nomresolve_(obj,mToken) ((nomMethodProc*)((void)obj, mToken))
-
-
-/* from oc's mtbl, with verification of o */
 #define NOM_Resolve(obj, objClassName, methodName) \
     (( nomTD_ ## objClassName ## _ ## methodName ) \