Fixed a void* to wxObject* conversion error in a return causing compile break across...

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

diff --git a/include/wx/expr.h b/include/wx/expr.h
index 777676fdddd4c856e99571037d1a09a487e0447d..52f45b9196fa4e8254df7730968789679fd69822 100644 (file)
--- a/include/wx/expr.h
+++ b/include/wx/expr.h
@@ -13,6 +13,9 @@
 #define _WX_EXPRH__
 
 #include <math.h>
 #define _WX_EXPRH__
 
 #include <math.h>

+#if defined(__VISAGECPP__) && __IBMCPP__ >= 400
+#  undef __BSEXCPT__
+#endif

 #include <stdlib.h>
 
 #ifdef ____HPUX__
 #include <stdlib.h>
 
 #ifdef ____HPUX__


@@ -79,8 +82,11 @@
 #define yy_scan_bytes PROIO_scan_bytes
 #define yy_flex_debug PROIO_flex_debug
 #define yy_flush_buffer PROIO_flush_buffer
 #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
 #define yyleng PROIO_yyleng
 #define yytext PROIO_yytext

+#endif

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {


@@ -96,7 +102,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 *);


@@ -107,6 +113,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();