Changeset 326 for trunk/idl-compiler/c/nom-idl-compiler.c

Timestamp:

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

Author:

cinc

Message:

Portability patches for Windows, Linux, Darwin by Bird.

File:

• trunk/idl-compiler/c/nom-idl-compiler.c (modified) (9 diffs)

trunk/idl-compiler/c/nom-idl-compiler.c

@@ -32 +32 @@
 *
 * ***** END LICENSE BLOCK ***** */
-#define INCL_DOSPROCESS
-#define INCL_DOS
-#define INCL_DOSPROFILE
-#define INCL_DOSERRORS
-
-#include <os2.h>
+#ifdef __OS2__
+# define INCL_DOSPROCESS
+# define INCL_DOS
+# define INCL_DOSPROFILE
+# define INCL_DOSERRORS
+# include <os2.h>
+#endif /* __OS2__ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <io.h>
+#ifdef HAVE_IO_H
+# include <io.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 #include <fcntl.h>
-#include <sys\stat.h>
-
-#include <glib.h> 
+#include <sys/stat.h>
+
+#include <glib.h>
 #include <glib/gprintf.h>
 
@@ -60 +67 @@
 
 /* Command line options */
-static GOptionEntry gOptionEntries[] = 
+static GOptionEntry gOptionEntries[] =
 {
   {"directory", 'd', 0, G_OPTION_ARG_FILENAME, &chrOutputDir, "Output directory", NULL},
@@ -361 +368 @@
    This is the root parse function. Here starts the fun. When a token is found in the
    input stream which matches one of the known token types the respective parsing function
-   is called for further processing. In case of an error the parsing function in question 
+   is called for further processing. In case of an error the parsing function in question
    prints an error which describes the problem and exits the application.
 
@@ -370 +377 @@
   while(g_scanner_peek_next_token(gScanner) != G_TOKEN_EOF) {
     GTokenType token;
+    GTokenValue value;
 
     g_scanner_get_next_token(gScanner);
     token=gScanner->token;
-    GTokenValue value=gScanner->value;
-    
+    value=gScanner->value;
+
     switch(token)
       {
@@ -468 +476 @@
 filename\n\n");
 
-  /* This prints the standard option help to screen. */  
+  /* This prints the standard option help to screen. */
   g_option_context_parse (gContext, &argc2, &argv2, &gError);
 }
@@ -494 +502 @@
 void funcMsgHandler(GScanner *gScanner, gchar *message, gboolean error)
 {
-  g_printf("%s:%d: error: %s (%d %d)\n", parseInfo.chrCurrentSourceFile,
+  g_printf("%s:%d: error: %s (%d %d)\n",
+           parseInfo.chrCurrentSourceFile ? parseInfo.chrCurrentSourceFile : "<null>", /* glib doesn't check for NULL like printf. */
            g_scanner_cur_line(gScanner)-parseInfo.uiLineCorrection, message,
            g_scanner_cur_line(gScanner), parseInfo.uiLineCorrection);
@@ -554 +563 @@
     }
 #endif
-  
+
   /*** Create output path name ****/
   if(g_path_is_absolute(chrOutputDir))
@@ -572 +581 @@
   else
     fd=open(argv[1], O_RDONLY);
-  
+
   if(-1==fd)
     {
@@ -600 +609 @@
   while(pSymbols->chrSymbolName)
     {
-#warning !!! Create a copy here so it is the same as with new symbols added later.
+#ifndef _MSC_VER
+# warning !!! Create a copy here so it is the same as with new symbols added later.
+#endif
       g_scanner_scope_add_symbol(gScanner, ID_SCOPE, pSymbols->chrSymbolName,
                                  pSymbols);