Applied patch [ 662321 ] Port of wxWindows to Wine

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

diff --git a/src/common/dosyacc.c b/src/common/dosyacc.c
index 5cd881ca33b60d63756d9446cd4259b537d1cb81..14672306db05b05c047f24023b31379a147a8d68 100644 (file)
--- a/src/common/dosyacc.c
+++ b/src/common/dosyacc.c
@@ -1,3 +1,11 @@
+#if defined(__WIN32__) || defined(__GNUWIN32__)
+/* all Win32 compilers can handle C++ comments, and C++ comments
+   is the only C++ in setup.h */
+#include "wx/setup.h"
+#endif
+
+#if !defined(wxUSE_PROLOGIO) || wxUSE_PROLOGIO
+

 #ifndef lint
 static char yysccsid[] = "@(#)yaccpar     1.7 (Berkeley) 09/09/90";
 #endif
 #ifndef lint
 static char yysccsid[] = "@(#)yaccpar     1.7 (Berkeley) 09/09/90";
 #endif


@@ -258,7 +266,7 @@ void yyerror(char *s)
 #define YYACCEPT goto yyaccept
 #define YYERROR goto yyerrlab
 int
 #define YYACCEPT goto yyaccept
 #define YYERROR goto yyerrlab
 int

-yyparse()
+PROIO_yyparse()

 {
     register int yym, yyn, yystate;
 #if YYDEBUG
 {
     register int yym, yyn, yystate;
 #if YYDEBUG


@@ -526,3 +534,5 @@ yyabort:
 yyaccept:
     return (0);
 }
 yyaccept:
     return (0);
 }

+
+#endif /* wxUSE_PROLOGIO */