needed to compile

[wxWidgets.git] / include / wx / expr.h

diff --git a/include/wx/expr.h b/include/wx/expr.h
index 7dee180b93cd77375c72b4ec64acb124665e5004..0b25cddaced7b3cb3be446880ed8cc8fbffc6e86 100644 (file)
--- a/include/wx/expr.h
+++ b/include/wx/expr.h
@@ -29,9 +29,6 @@
 #define yyoutput PROIO_yyoutput
 #define yylex PROIO_yylex
 #define yyerror PROIO_yyerror
-#define input PROIO_input
-#define unput PROIO_unput
-
 #define yyleng PROIO_yyleng
 #define yytext PROIO_yytext
 #define yymorfg PROIO_yymorfg
@@ -82,8 +79,11 @@
 #define yy_scan_bytes PROIO_scan_bytes
 #define yy_flex_debug PROIO_flex_debug
 #define yy_flush_buffer PROIO_flush_buffer
+#if !defined(__VISAGECPP__)
+// multiply defined???
 #define yyleng PROIO_yyleng
 #define yytext PROIO_yytext
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -99,7 +99,7 @@ void process_command(char *);
 void syntax_error(char *);
 }
 #else
-#if __BORLANDC__
+#if defined(__BORLANDC__) || defined(__VISAGECPP__)
 char *proio_cons(char *, char *);
 char * wxmake_integer(char *);
 char * wxmake_word(char *);
@@ -110,6 +110,7 @@ char * wxmake_exp2(char *, char *, char*);
 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);
+int  lex_input(void);
 #else
 char *proio_cons();
 char * wxmake_integer();