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

Files:

• Makefile.kup (added)
• h_file_emitter.c (modified) (9 diffs)

trunk/idl-compiler/h-emitter_c/h_file_emitter.c

@@ -32 +32 @@
 *
 * ***** END LICENSE BLOCK ***** */
-#include <os2.h>
+#ifdef __OS2__
+# include <os2.h>
+#endif  /* __OS2__ */
+
 #include <stdlib.h>
 #include <string.h>
@@ -107 +110 @@
 
   fprintf(fh, "/* Class data structure */\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, "NOMEXTERN struct %sClassDataStructure {\n", pif->chrName);
 
@@ -116 +124 @@
       fprintf(fh, "    nomMToken %s;\n", pm->chrName);
     }
-  fprintf(fh, "}%sClassData;\n\n", pif->chrName);
-
+  fprintf(fh, "} NOMDLINK %sClassData;\n\n", pif->chrName);
+
+  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, "NOMEXTERN struct %sCClassDataStructure {\n", pif->chrName);
   fprintf(fh, "   nomMethodTabs parentMtab;\n");
@@ -132 +145 @@
   if(strcmp(pif->chrName , "NOMObject"))
     {
+/* FIXME: why is this here too? it's already in nomtk.h... */
       fprintf(fh, "/* This function is used to check if a given object is valid and the\n");
       fprintf(fh, "   object supports the method */\n");
@@ -181 +195 @@
               pif->chrName, pm->chrName);
       /* Forward declaration of parameter test function */
+      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, "NOMEXTERN gboolean NOMLINK parmCheckFunc_%s_%s(%s *nomSelf,\n",
               pif->chrName,  pm->chrName, pif->chrName);
@@ -266 +285 @@
 
   fprintf(fh, "/*\n * Class creation function\n */\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, "NOMEXTERN NOMClass * NOMLINK %sNewClass(gulong clsMajorVersion, gulong clsMinorVersion);\n\n",
           pif->chrName);
@@ -291 +315 @@
   PINTERFACE pifParent=pif;
 
-  while((pifParent=getParentInterface(pifParent))!=NULLHANDLE)
+  while((pifParent=getParentInterface(pifParent))!=NULL)
     {
       GPtrArray *pArray; 
@@ -345 +369 @@
               
               //printInterface(pif);              
-              if((pLocalPI->outFile=openOutfile(gScanner, chrTemp))!=NULLHANDLE)
+              if((pLocalPI->outFile=openOutfile(gScanner, chrTemp))!=NULL)
                 {
                   emitHFileHeader(pLocalPI, pif);
@@ -357 +381 @@
                   emitHFileFooter(pLocalPI, pif);
                   closeOutfile(pLocalPI->outFile);
+                  pLocalPI->outFile = NULL;
                 }
               g_free(chrTemp);