Mutiple updates from SciTech for wxWindows including the following:

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

diff --git a/src/common/dosyacc.c b/src/common/dosyacc.c
index 9515eb878c33c31b9f1f18b9b765cce24d56c699..a773cce6ef742978d6b165a1e563d6592f3876ac 100644 (file)
--- a/src/common/dosyacc.c
+++ b/src/common/dosyacc.c
@@ -247,7 +247,10 @@ void yyerror(char *s)
 #define yywrap() 1
 #endif
 #else
-int yywrap() { return 1; }
+#  if !(defined(__VISAGECPP__) && __IBMC__ >= 400)
+/* VA 4.0 thinks this is multiply defined (in lex_yy.c) */
+   int yywrap() { return 1; }
+#  endif
 #endif
 #endif
 #line 247 "y_tab.c"
@@ -255,7 +258,7 @@ int yywrap() { return 1; }
 #define YYACCEPT goto yyaccept
 #define YYERROR goto yyerrlab
 int
-yyparse()
+PROIO_yyparse()
 {
     register int yym, yyn, yystate;
 #if YYDEBUG