Changeset 376 for trunk/idl-compiler

Timestamp:

Jun 29, 2008, 6:33:14 PM (17 years ago)

Author:

cinc

Message:

Disable macros in header files when using the NOM compiler.

Location:

trunk/idl-compiler

Files:

• h-emitter_c/h_file_emitter.c (modified) (3 diffs)
• ih-emitter_c/ih_file_emitter.c (modified) (2 diffs)

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

@@ -64 +64 @@
   fprintf(fh, "#endif /* __cplusplus */\n\n");
 
+  fprintf(fh, "#ifndef NOMCOMPILER\n");
+  
   /* Define the name as an object */
   fprintf(fh, "#if !defined(_%s_defined)\n", pif->chrName);
@@ -72 +74 @@
   fprintf(fh, "#endif\n");
   fprintf(fh, "#endif\n\n");
-
 }
 
@@ -356 +357 @@
   pArray=pif->pMethodArray;
   
-  fprintf(fh, "#ifdef NOMCOMPILER\n");
+  fprintf(fh, "#else /* NOMCOMPILER */\n");
+
+  emitInterfaceIncludes(pLocalPI, pif);
 
   fprintf(fh, "interface %s", pif->chrName);

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

@@ -61 +61 @@
   fprintf(fh, "#include \"%s.h\"\n\n", pif->chrFileStem);
 
+  fprintf(fh, "#ifndef NOMCOMPILER\n");
+
 }
 
@@ -574 +576 @@
 
   fprintf(fh, "\n#endif /* NOM_%s_IMPLEMENTATION_FILE */\n", pif->chrName);
+  
+  fprintf(fh, "#endif /* NOMCOMPILER */\n");
+
   fprintf(fh, "#endif/* %s_IH */\n", pif->chrName);
 }