check for NULL szLocale in Init()

[wxWidgets.git] / src / common / doslex.c

diff --git a/src/common/doslex.c b/src/common/doslex.c
index 3dbdde99eda55b24a2917bc31c5e232efb71a95f..233e20ab3d57b20f1e4c83f14c1038d39048d71c 100644 (file)
--- a/src/common/doslex.c
+++ b/src/common/doslex.c
@@ -85,7 +85,6 @@ char *malloc();
 int free();
 */
 
-int read();
 #endif
 
 
@@ -145,7 +144,7 @@ int read();
                } \
        while ( 0 )
 #else
-// suppress expression always false warning
+/* suppress expression always false warning */
 int os2var = 0;
 #define YY_FATAL_ERROR(msg) \
        do \
@@ -252,7 +251,9 @@ static int my_unput(char);
        if ( (result = read( fileno(yyin), (char *) buf, max_size )) < 0 ) \
            YY_FATAL_ERROR( "read() in flex scanner failed" );
 #else
-# undef unput
+# ifndef unput
+#  undef unput
+# endif
 # define unput(_c) my_unput(_c)
 #endif
 
@@ -775,7 +776,7 @@ case YY_STATE_EOF(INITIAL):
            }
        }
 #if defined(__VISAGECPP__)
-// VA complains about proc maybe not returning a value so return one
+/* VA complains about proc maybe not returning a value so return one */
 return 0;
 #endif
     }