Changeset 326 for trunk/idl-compiler/ih-emitter_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/idl-compiler/ih-emitter_c

Files:

• Makefile.kup (added)
• ih_file_emitter.c (modified) (16 diffs)

trunk/idl-compiler/ih-emitter_c/ih_file_emitter.c

@@ -32 +32 @@
 *
 * ***** END LICENSE BLOCK ***** */
-#include <os2.h>
+#ifdef __OS2__
+# include <os2.h>
+#endif /* __OS2__ */
+
 #include <stdlib.h>
 #include <string.h>
@@ -80 +83 @@
             fprintf(fh, "  %s;\n", piv->chrName);
     }
-  fprintf(fh, "}%sData;\n\n", pif->chrName);
+#ifdef _MSC_VER
+  if(!a)
+    fprintf(fh, "  int iDummy;\n"); /* HACK ALERT! */
+#endif
+  fprintf(fh, "} %sData;\n\n", pif->chrName);
 }
 
@@ -86 +93 @@
 {
   FILE* fh=pLocalPI->outFile;
-  GPtrArray *pArray=pif->pInstanceVarArray;;
+  GPtrArray *pArray=pif->pInstanceVarArray;
   int a;
 
@@ -116 +123 @@
 
   fprintf(fh, "/*** Class data structures ***/\n");
-  fprintf(fh, "struct %sClassDataStructure %sClassData = {0};\n", pif->chrName, pif->chrName );
-  fprintf(fh, "static struct %sCClassDataStructure %sCClassData = {0};\n\n",
+  fprintf(fh, "NOMDLLEXPORT struct %sClassDataStructure %sClassData = {0};\n", pif->chrName, pif->chrName );
+  fprintf(fh, "NOMDLLEXPORT struct %sCClassDataStructure %sCClassData = {0};\n\n",
           pif->chrName, pif->chrName);
 }
@@ -126 +133 @@
 NOMEXTERN gboolean NOMLINK objectCheckFunc_WPRootFolder(WPRootFolder *nomSelf, gchar* chrMethodName)
 {
-if(!nomIsObj(nomSelf) || !_nomIsANoClsCheck(nomSelf , WPRootFolderClassData.classObject, NULLHANDLE))
+if(!nomIsObj(nomSelf) || !_nomIsANoClsCheck(nomSelf , WPRootFolderClassData.classObject, NULL))
   {
   nomPrintObjectPointerError(nomSelf, "WPRootFolder", chrMethodName);
@@ -170 +177 @@
       fprintf(fh, "\",\n");      
     }
+#ifdef _MSC_VER
+  if(!a)
+    fprintf(fh, "  NULL\n");
+#endif
 }
 
@@ -187 +198 @@
       fprintf(fh, "#if !defined(_decl_impl_%s_%s_)\n", pif->chrName, pm->chrName);
       fprintf(fh, "#define _decl_impl_%s_%s_ 1\n", pif->chrName, pm->chrName);
-      fprintf(fh, "NOM_Scope ");
+      fprintf(fh, "NOMDLLEXPORT NOM_Scope ");
       emitReturnType(pLocalPI, pif, pm);
       fprintf(fh, " NOMLINK impl_%s_%s(%s *nomSelf,\n", pif->chrName, pm->chrName, pif->chrName);
@@ -238 +249 @@
         }
 
-      fprintf(fh, "NOM_Scope ");
+      fprintf(fh, "NOMDLLEXPORT NOM_Scope ");
       emitReturnType(pLocalPI, pif, pm);
       fprintf(fh, " NOMLINK impl_%s_%s(%s* nomSelf,\n", pif->chrName, pom->chrName, pif->chrName);
@@ -271 +282 @@
   fprintf(fh, "static nomOverridenMethodDesc nomOverridenMethods%s[] = {\n", pif->chrName);
 
+  pArray=pif->pOverrideArray;
+
   for(a=0;a<pArray->len;a++)
     {
@@ -289 +302 @@
       fprintf(fh, "  },\n");
     }
-    fprintf(fh, "};\n\n");
+#ifdef _MSC_VER
+  if(!a)
+    fprintf(fh, "  { NULL, NULL, NULL }\n");
+#endif
+  fprintf(fh, "};\n\n");
 }
 
@@ -316 +333 @@
       fprintf(fh, "},\n");
     }
+#ifdef _MSC_VER
+  if(!a)
+    fprintf(fh, "  { NULL, NULL, NULL, NULL, NULL }\n");
+#endif
   fprintf(fh, "};\n\n");
 }
@@ -344 +365 @@
       /* Emit the parents. We have to output them sorted beginning from the
          leftmost parent. */
-      while(pifParent->chrParent && (pifParent=findInterfaceFromName(pifParent->chrParent))!=NULLHANDLE)
+      while(pifParent->chrParent && (pifParent=findInterfaceFromName(pifParent->chrParent))!=NULL)
         {
           g_ptr_array_add(pArray, (gpointer) pifParent);
@@ -372 +393 @@
   PINTERFACE pifParent=pif;
 
-  while(pifParent->chrParent && (pifParent=findInterfaceFromName(pifParent->chrParent))!=NULLHANDLE)
+  while(pifParent->chrParent && (pifParent=findInterfaceFromName(pifParent->chrParent))!=NULL)
     ulRet++;
 
@@ -498 +519 @@
     }
   fprintf(fh, "#include \"nomgc.h\"\n");
+  fprintf(fh, "#ifdef NOM_%s_IMPLEMENTATION_FILE\n", pif->chrName);
+  fprintf(fh, "NOMDLLEXPORT\n");
+  fprintf(fh, "#else\n");
+  fprintf(fh, "NOMDLLIMPORT\n");
+  fprintf(fh, "#endif\n");
   fprintf(fh, "NOMClass* NOMLINK %sNewClass(gulong ulMajor, gulong ulMinor)\n", pif->chrName);
   fprintf(fh, "{\n");
@@ -516 +542 @@
   fprintf(fh, "    nomEndRegisterDLLWithGC(hReg);\n");
   fprintf(fh, "    }\n");
+  fprintf(fh, "#elif defined(_WIN32)\n");
+  fprintf(fh, " /* FIXME: check this up with the GC. */\n");
+  fprintf(fh, "#elif defined(__APPLE__)\n");
+  fprintf(fh, "# warning FIXME: Check out GC/dylib.\n");
+  fprintf(fh, "#elif defined(__linux__)\n");
+  fprintf(fh, "# warning FIXME: Check out GC/so on linux.\n");
   fprintf(fh, "#else\n");
   fprintf(fh, "#error DLL must be registered with the garbage collector!\n");
@@ -562 +594 @@
               //printInterface(pif);
               chrTemp=g_strconcat(pif->chrFileStem, ".ih", NULL);
-              if((pLocalPI->outFile=openOutfile(gScanner, chrTemp))!=NULLHANDLE)
+              if((pLocalPI->outFile=openOutfile(gScanner, chrTemp))!=NULL)
                 {
                   emitIHFileHeader(pLocalPI, pif);