[Adonthell-commits] CVS: adonthell/src/tools/dlgedit dlg_cmdline.cc,1.2,1.3 gui_settings.cc,1.2,1.3 lex.loadlg.cc,1.13,1.14 loadlg.l,1.10,1.11 main.cc,1.55,1.56

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src/tools/dlgedit
In directory subversions:/tmp/cvs-serv8875

Modified Files:
        dlg_cmdline.cc gui_settings.cc lex.loadlg.cc loadlg.l main.cc 
Log Message:
FIXES to compile with g++ 3.0

Index: dlg_cmdline.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/dlg_cmdline.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** dlg_cmdline.cc      12 Apr 2002 15:35:41 -0000      1.2
--- dlg_cmdline.cc      17 Apr 2002 10:01:17 -0000      1.3
***************
*** 20,24 ****
   */
   
! #include <iostream> 
  #include <dirent.h>
  #include <getopt.h>
--- 20,24 ----
   */
   
! #include <iostream.h> 
  #include <dirent.h>
  #include <getopt.h>
***************
*** 49,53 ****
              case 'd':
              {
!                 cout << datadir << endl;
                  return false;
              }
--- 49,53 ----
              case 'd':
              {
!                 cout << datadir << std::endl;
                  return false;
              }
***************
*** 55,59 ****
              case 'v':
              {
!                 cout << _VERSION_ << endl;
                  return false; 
              }
--- 55,59 ----
              case 'v':
              {
!                 cout << _VERSION_ << std::endl;
                  return false; 
              }

Index: gui_settings.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/gui_settings.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** gui_settings.cc     7 Apr 2002 09:51:28 -0000       1.2
--- gui_settings.cc     17 Apr 2002 10:01:17 -0000      1.3
***************
*** 22,25 ****
--- 22,26 ----
  #include <gtk/gtk.h>
  #include <sys/stat.h>
+ #include <iostream.h>
  #include "dlg_types.h"
  #include "gui_file.h"

Index: lex.loadlg.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/lex.loadlg.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** lex.loadlg.cc       7 Apr 2002 09:51:28 -0000       1.13
--- lex.loadlg.cc       17 Apr 2002 10:01:17 -0000      1.14
***************
*** 28,32 ****
  
  #include <stdio.h>
! 
  
  /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
--- 28,32 ----
  
  #include <stdio.h>
! #include <errno.h>
  
  /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
***************
*** 41,45 ****
--- 41,53 ----
  
  #include <stdlib.h>
+ #ifndef _WIN32
  #include <unistd.h>
+ #else
+ #ifndef YY_ALWAYS_INTERACTIVE
+ #ifndef YY_NEVER_INTERACTIVE
+ extern int isatty YY_PROTO(( int ));
+ #endif
+ #endif
+ #endif
  
  /* Use prototypes in function declarations. */
***************
*** 467,476 ****
  #include "dlg_types.h"
  
! #define YY_DECL int parse_dlgfile (string &mytext, int &mynum)
  #define text 1
  
  #define YY_NO_UNPUT 1
  #define YY_NEVER_INTERACTIVE 1
! #line 475 "lex.loadlg.cc"
  
  /* Macros after this point can all be overridden by user definitions in
--- 475,484 ----
  #include "dlg_types.h"
  
! #define YY_DECL int parse_dlgfile (std::string &mytext, int &mynum)
  #define text 1
  
  #define YY_NO_UNPUT 1
  #define YY_NEVER_INTERACTIVE 1
! #line 483 "lex.loadlg.cc"
  
  /* Macros after this point can all be overridden by user definitions in
***************
*** 572,578 ****
                result = n; \
                } \
!       else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
!                 && ferror( yyin ) ) \
!               YY_FATAL_ERROR( "input in flex scanner failed" );
  #endif
  
--- 580,597 ----
                result = n; \
                } \
!       else \
!               { \
!               errno=0; \
!               while ( (result = fread(buf, 1, max_size, yyin))==0 && 
ferror(yyin)) \
!                       { \
!                       if( errno != EINTR) \
!                               { \
!                               YY_FATAL_ERROR( "input in flex scanner failed" 
); \
!                               break; \
!                               } \
!                       errno=0; \
!                       clearerr(yyin); \
!                       } \
!               }
  #endif
  
***************
*** 626,630 ****
  
  
! #line 629 "lex.loadlg.cc"
  
        if ( yy_init )
--- 645,649 ----
  
  
! #line 648 "lex.loadlg.cc"
  
        if ( yy_init )
***************
*** 854,858 ****
  ECHO;
        YY_BREAK
! #line 857 "lex.loadlg.cc"
  case YY_STATE_EOF(INITIAL):
  case YY_STATE_EOF(text):
--- 873,877 ----
  ECHO;
        YY_BREAK
! #line 876 "lex.loadlg.cc"
  case YY_STATE_EOF(INITIAL):
  case YY_STATE_EOF(text):
***************
*** 1419,1425 ****
  
  
  #ifndef YY_ALWAYS_INTERACTIVE
  #ifndef YY_NEVER_INTERACTIVE
! #include<unistd.h>
  #endif
  #endif
--- 1438,1448 ----
  
  
+ #ifndef _WIN32
+ #include <unistd.h>
+ #else
  #ifndef YY_ALWAYS_INTERACTIVE
  #ifndef YY_NEVER_INTERACTIVE
! extern int isatty YY_PROTO(( int ));
! #endif
  #endif
  #endif

Index: loadlg.l
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/loadlg.l,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** loadlg.l    7 Apr 2002 09:51:28 -0000       1.10
--- loadlg.l    17 Apr 2002 10:01:17 -0000      1.11
***************
*** 18,22 ****
  #include "dlg_types.h"
  
! #define YY_DECL int parse_dlgfile (string &mytext, int &mynum)
  %}
  
--- 18,22 ----
  #include "dlg_types.h"
  
! #define YY_DECL int parse_dlgfile (std::string &mytext, int &mynum)
  %}
  

Index: main.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/tools/dlgedit/main.cc,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** main.cc     12 Apr 2002 15:35:41 -0000      1.55
--- main.cc     17 Apr 2002 10:01:17 -0000      1.56
***************
*** 25,28 ****
--- 25,29 ----
  
  #include <gtk/gtk.h>
+ #include <iostream.h>
  #include <locale.h>
  #include "gettext.h"