corrected to allow drag and drop for mingw32/gcc295

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

diff --git a/include/wx/expr.h b/include/wx/expr.h
index 7dee180b93cd77375c72b4ec64acb124665e5004..4555550dce93129a2a32363ff48f4a32c18118d9 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 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
 #define yyleng PROIO_yyleng
 #define yytext PROIO_yytext
 #define yymorfg PROIO_yymorfg


@@ -99,7 +96,7 @@ void process_command(char *);
 void syntax_error(char *);
 }
 #else
 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 *);
 char *proio_cons(char *, char *);
 char * wxmake_integer(char *);
 char * wxmake_word(char *);


@@ -110,6 +107,7 @@ char * wxmake_exp2(char *, char *, char*);
 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);
 void add_expr(char *);
 void process_command(char *);
 void syntax_error(char *);

+int  lex_input(void);

 #else
 char *proio_cons();
 char * wxmake_integer();
 #else
 char *proio_cons();
 char * wxmake_integer();