wxLocale now uses wxEncodingConverter (must be explicitly enabled)

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

diff --git a/src/common/doslex.c b/src/common/doslex.c
index 94234160cbda41c2d44a2444fa14f47de0a61fe8..bbf61f0eaccdbf42c563925be99a6ea50a19a885 100644 (file)
--- a/src/common/doslex.c
+++ b/src/common/doslex.c
@@ -231,7 +231,7 @@ extern char *malloc();
 #endif
 #define Return(x) return x;
 
-#if defined(VMS) && !defined(strdup)
+#if defined(VMS) && ( __VMS_VER < 70000000 )
 #define strdup(s) (strcpy((char *)malloc(strlen(s)+1), s));
 #endif
 
@@ -252,7 +252,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