reverted Julian's unintentional breakage of wxChoice

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

diff --git a/include/wx/expr.h b/include/wx/expr.h
index 0b25cddaced7b3cb3be446880ed8cc8fbffc6e86..90c233795f3050d4827a47a00c2ef66788b87816 100644 (file)
--- a/include/wx/expr.h
+++ b/include/wx/expr.h
@@ -13,77 +13,15 @@
 #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__
 #define alloca malloc
 #endif
 
 #include <stdlib.h>
 
 #ifdef ____HPUX__
 #define alloca malloc
 #endif
 

-/* Rename all YACC/LEX stuff or we'll conflict with other
- * applications
- */
-
-#define yyback PROIO_yyback
-#define yylook PROIO_yylook
-#define yywrap PROIO_yywrap
-#define yyoutput PROIO_yyoutput
-#define yylex PROIO_yylex
-#define yyerror PROIO_yyerror
-#define yyleng PROIO_yyleng
-#define yytext PROIO_yytext
-#define yymorfg PROIO_yymorfg
-#define yylineno PROIO_yylineno
-#define yytchar PROIO_yytchar
-#define yyin PROIO_yyin
-#define yyout PROIO_yyout
-#define yysvf PROIO_yysvf
-#define yyestate PROIO_yyestate
-#define yysvec PROIO_yysvec
-#define yybgin PROIO_yybgin
-#define yyprevious PROIO_yyprevious
-#define yylhs PROIO_yylhs
-#define yylen PROIO_yylen
-#define yydefred PROIO_yydefred
-#define yydgoto PROIO_yydgoto
-#define yysindex PROIO_yysindex
-#define yyrindex PROIO_yyrindex
-#define yygindex PROIO_yygindex
-#define yytable PROIO_yytable
-#define yycheck PROIO_yycheck
-#define yyname PROIO_yyname
-#define yyrule PROIO_yyrule
-#define yydebug PROIO_yydebug
-#define yynerrs PROIO_yynerrs
-#define yyerrflag PROIO_yyerrflag
-#define yychar PROIO_yychar
-#define yyvsp PROIO_yyvsp
-#define yyssp PROIO_yyssp
-#define yyval PROIO_yyval
-#define yylval PROIO_yylval
-#define yyss PROIO_yyss
-#define yyvs PROIO_yyvs
-#define yyparse PROIO_yyparse
-
-/* +++steve162e: more defines necessary */
-#define yy_init_buffer PROIO_yy_init_buffer
-#define yy_create_buffer PROIO_yy_create_buffer
-#define yy_load_buffer_state PROIO_yy_load_buffer_state
-#define yyrestart PROIO_yyrestart
-#define yy_switch_to_buffer PROIO_yy_switch_to_buffer
-#define yy_delete_buffer PROIO_yy_delete_buffer
-/* ---steve162e */
-
-/* WG 1/96: still more for flex 2.5 */
-#define yy_scan_buffer PROIO_scan_buffer
-#define yy_scan_string PROIO_scan_string
-#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" {
 
 #ifdef __cplusplus
 extern "C" {