[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Adonthell-commits] CVS: adonthell/src Makefile.am,1.88,1.89 fileops.cc,
From: |
Kai Sterker <address@hidden> |
Subject: |
[Adonthell-commits] CVS: adonthell/src Makefile.am,1.88,1.89 fileops.cc,1.7,1.8 lex.prefs.cc,1.11,1.12 |
Date: |
Mon, 29 Apr 2002 11:57:38 -0400 |
Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv24193
Modified Files:
Makefile.am fileops.cc lex.prefs.cc
Log Message:
FIXED typo in fileops.cc
FIXED: getopt.h was missing in 'make dist' target
Index: Makefile.am
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/Makefile.am,v
retrieving revision 1.88
retrieving revision 1.89
diff -C2 -r1.88 -r1.89
*** Makefile.am 28 Apr 2002 18:03:18 -0000 1.88
--- Makefile.am 29 Apr 2002 15:57:35 -0000 1.89
***************
*** 30,34 ****
adonthell.h animation.h audio.h callback.h py_callback.h \
character_base.h character.h gamedata.h data_screen.h dialog.h
dialog_screen.h \
! drawable.h drawing_area.h event.h fileops.h game.h gametime.h gettext.h
image.h input.h inventory.h \
item.h landmap.h mapsquare.h mapsquare_walkable.h nls.h mapcharacter.h
mapobject.h mapview.h \
path.h pnm.h prefs.h python_class.h py_object.h quest.h screen.h surface.h
storage.h \
--- 30,34 ----
adonthell.h animation.h audio.h callback.h py_callback.h \
character_base.h character.h gamedata.h data_screen.h dialog.h
dialog_screen.h \
! drawable.h drawing_area.h event.h fileops.h game.h gametime.h gettext.h
getopt.h image.h input.h inventory.h \
item.h landmap.h mapsquare.h mapsquare_walkable.h nls.h mapcharacter.h
mapobject.h mapview.h \
path.h pnm.h prefs.h python_class.h py_object.h quest.h screen.h surface.h
storage.h \
Index: fileops.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/fileops.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** fileops.cc 25 Apr 2002 19:30:08 -0000 1.7
--- fileops.cc 29 Apr 2002 15:57:35 -0000 1.8
***************
*** 294,298 ****
// file is older than code
else
! cerr << "You should propably get a more recent data package.\n";
return false;
--- 294,298 ----
// file is older than code
else
! cerr << "You should probably get a more recent data package.\n";
return false;
Index: lex.prefs.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/lex.prefs.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** lex.prefs.cc 27 Apr 2002 22:08:29 -0000 1.11
--- lex.prefs.cc 29 Apr 2002 15:57:35 -0000 1.12
***************
*** 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. */
***************
*** 470,474 ****
#define YY_NO_UNPUT 1
#define YY_NEVER_INTERACTIVE 1
! #line 473 "lex.prefs.cc"
/* Macros after this point can all be overridden by user definitions in
--- 478,482 ----
#define YY_NO_UNPUT 1
#define YY_NEVER_INTERACTIVE 1
! #line 481 "lex.prefs.cc"
/* Macros after this point can all be overridden by user definitions in
***************
*** 570,576 ****
result = n; \
} \
! else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
! && ferror( yyin ) ) \
! YY_FATAL_ERROR( "input in flex scanner failed" );
#endif
--- 578,595 ----
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
***************
*** 624,628 ****
! #line 627 "lex.prefs.cc"
if ( yy_init )
--- 643,647 ----
! #line 646 "lex.prefs.cc"
if ( yy_init )
***************
*** 787,791 ****
ECHO;
YY_BREAK
! #line 790 "lex.prefs.cc"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(text):
--- 806,810 ----
ECHO;
YY_BREAK
! #line 809 "lex.prefs.cc"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(text):
***************
*** 1352,1358 ****
#ifndef YY_ALWAYS_INTERACTIVE
#ifndef YY_NEVER_INTERACTIVE
! #include<unistd.h>
#endif
#endif
--- 1371,1381 ----
+ #ifndef _WIN32
+ #include <unistd.h>
+ #else
#ifndef YY_ALWAYS_INTERACTIVE
#ifndef YY_NEVER_INTERACTIVE
! extern int isatty YY_PROTO(( int ));
! #endif
#endif
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Adonthell-commits] CVS: adonthell/src Makefile.am,1.88,1.89 fileops.cc,1.7,1.8 lex.prefs.cc,1.11,1.12,
Kai Sterker <address@hidden> <=