- gcc 3.x fixes (patches stolen from RH).

Changed files:
    flex-gcc3.patch -> 1.1
    flex-gcc31.patch -> 1.1

diff --git a/flex-gcc3.patch b/flex-gcc3.patch
new file mode 100644 (file)
index 0000000..a73dc41
--- /dev/null
+++ b/flex-gcc3.patch
@@ -0,0 +1,11 @@
+--- flex-2.5.4/skel.c.orig     Tue Nov  6 17:29:12 2001
++++ flex-2.5.4/skel.c  Tue Nov  6 17:28:49 2001
+@@ -31,7 +31,7 @@
+   "",
+   "#include <stdlib.h>",
+   "%+",
+-  "class istream;",
++  "#include <iostream.h>",
+   "%*",
+   "",
+   "/* Use prototypes in function declarations. */",

diff --git a/flex-gcc31.patch b/flex-gcc31.patch
new file mode 100644 (file)
index 0000000..9fc5554
--- /dev/null
+++ b/flex-gcc31.patch
@@ -0,0 +1,94 @@
+--- flex-2.5.4.orig/FlexLexer.h        Sun Jul 27 11:41:38 1997
++++ flex-2.5.4/FlexLexer.h     Wed Apr 17 09:57:22 2002
+@@ -44,7 +44,7 @@
+ #ifndef __FLEX_LEXER_H
+ // Never included before - need to define base class.
+ #define __FLEX_LEXER_H
+-#include <iostream.h>
++#include <iostream>
+ 
+ extern "C++" {
+ 
+@@ -61,14 +61,14 @@
+       virtual void
+               yy_switch_to_buffer( struct yy_buffer_state* new_buffer ) = 0;
+       virtual struct yy_buffer_state*
+-              yy_create_buffer( istream* s, int size ) = 0;
++              yy_create_buffer( std::istream* s, int size ) = 0;
+       virtual void yy_delete_buffer( struct yy_buffer_state* b ) = 0;
+-      virtual void yyrestart( istream* s ) = 0;
++      virtual void yyrestart( std::istream* s ) = 0;
+ 
+       virtual int yylex() = 0;
+ 
+       // Call yylex with new input/output sources.
+-      int yylex( istream* new_in, ostream* new_out = 0 )
++      int yylex( std::istream* new_in, std::ostream* new_out = 0 )
+               {
+               switch_streams( new_in, new_out );
+               return yylex();
+@@ -76,8 +76,8 @@
+ 
+       // Switch to new input/output streams.  A nil stream pointer
+       // indicates "keep the current one".
+-      virtual void switch_streams( istream* new_in = 0,
+-                                      ostream* new_out = 0 ) = 0;
++      virtual void switch_streams( std::istream* new_in = 0,
++                                      std::ostream* new_out = 0 ) = 0;
+ 
+       int lineno() const              { return yylineno; }
+ 
+@@ -104,17 +104,17 @@
+ public:
+       // arg_yyin and arg_yyout default to the cin and cout, but we
+       // only make that assignment when initializing in yylex().
+-      yyFlexLexer( istream* arg_yyin = 0, ostream* arg_yyout = 0 );
++      yyFlexLexer( std::istream* arg_yyin = 0, std::ostream* arg_yyout = 0 );
+ 
+       virtual ~yyFlexLexer();
+ 
+       void yy_switch_to_buffer( struct yy_buffer_state* new_buffer );
+-      struct yy_buffer_state* yy_create_buffer( istream* s, int size );
++      struct yy_buffer_state* yy_create_buffer( std::istream* s, int size );
+       void yy_delete_buffer( struct yy_buffer_state* b );
+-      void yyrestart( istream* s );
++      void yyrestart( std::istream* s );
+ 
+       virtual int yylex();
+-      virtual void switch_streams( istream* new_in, ostream* new_out );
++      virtual void switch_streams( std::istream* new_in, std::ostream* new_out );
+ 
+ protected:
+       virtual int LexerInput( char* buf, int max_size );
+@@ -125,7 +125,7 @@
+       int yyinput();
+ 
+       void yy_load_buffer_state();
+-      void yy_init_buffer( struct yy_buffer_state* b, istream* s );
++      void yy_init_buffer( struct yy_buffer_state* b, std::istream* s );
+       void yy_flush_buffer( struct yy_buffer_state* b );
+ 
+       int yy_start_stack_ptr;
+@@ -140,8 +140,8 @@
+       yy_state_type yy_try_NUL_trans( yy_state_type current_state );
+       int yy_get_next_buffer();
+ 
+-      istream* yyin;  // input source for default LexerInput
+-      ostream* yyout; // output sink for default LexerOutput
++      std::istream* yyin;     // input source for default LexerInput
++      std::ostream* yyout;    // output sink for default LexerOutput
+ 
+       struct yy_buffer_state* yy_current_buffer;
+ 
+--- flex-2.5.4.orig/skel.c     Wed Apr 17 09:54:49 2002
++++ flex-2.5.4/skel.c  Wed Apr 17 09:56:01 2002
+@@ -31,7 +31,8 @@
+   "",
+   "#include <stdlib.h>",
+   "%+",
+-  "#include <iostream.h>",
++  "#include <iostream>",
++  "using namespace std;",
+   "%*",
+   "",
+   "/* Use prototypes in function declarations. */",