X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/004fd0c8834ca526d335a9294322d9def17ef8a9..67fade3398f9c35a8e042749ed340c898f7e7bdd:/src/common/doslex.c?ds=sidebyside diff --git a/src/common/doslex.c b/src/common/doslex.c index 94234160cb..233e20ab3d 100644 --- 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 \ @@ -231,7 +230,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 +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 }