flex 2.3 patch #5

[Vern Paxson]

It's been pointed out to me that the previous flex patches will prevent
"make test" from succeeding since initscan.c is now out of date.  This
patch brings initscan.c up to date for the changes through patch #4.
If you don't care about running "make test", you can skip this patch.

		Vern


*** Patch-4/Changes	Tue Aug 14 00:08:22 1990
--- Patch-5/Changes	Thu Aug 16 20:22:16 1990
***************
*** 1,3 ****
--- 1,9 ----
+ Changes between 2.3 Patch #5 (16Aug90) and 2.3 Patch #4:
+ 
+ 	- An up-to-date version of initscan.c so "make test" will
+ 	  work after applying the previous patches
+ 
+ 
  Changes between 2.3 Patch #4 (14Aug90) and 2.3 Patch #3:
  
  	- Fixed bug in hexadecimal escapes which allowed only digits,
*** Original/initscan.c	Thu Jun 28 00:44:51 1990
--- Patch-5/initscan.c	Thu Aug 16 20:18:52 1990
***************
*** 1,7 ****
  /* A lexical scanner generated by flex */
  
  /* scanner skeleton version:
!  * $Header: /usr/fsys/odin/a/vern/flex/RCS/flex.skel,v 2.13 90/05/26 17:24:13 vern Exp $
   */
  
  #define FLEX_SCANNER
--- 1,7 ----
  /* A lexical scanner generated by flex */
  
  /* scanner skeleton version:
!  * $Header: /usr/fsys/odin/a/vern/flex/RCS/flex.skel,v 2.16 90/08/03 14:09:36 vern Exp $
   */
  
  #define FLEX_SCANNER
***************
*** 8,27 ****
  
  #include <stdio.h>
  
- #ifdef __STDC__
  
- #ifndef DONT_HAVE_STDLIB_H
- #include <stdlib.h>
- #else
- void *malloc( unsigned );
- void free( void* );
- #endif
- 
- #define YY_USE_PROTOS
- #define YY_USE_CONST
- #endif
- 
- 
  /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
  #ifdef c_plusplus
  #ifndef __cplusplus
--- 8,14 ----
***************
*** 32,41 ****
  
  #ifdef __cplusplus
  
- #ifndef __STDC__
  #include <stdlib.h>
- #endif
- 
  #include <osfcn.h>
  
  /* use prototypes in function declarations */
--- 19,25 ----
***************
*** 44,52 ****
  /* the "const" storage-class-modifier is valid */
  #define YY_USE_CONST
  
! #endif
  
  
  #ifdef __TURBOC__
  #define YY_USE_CONST
  #endif
--- 28,52 ----
  /* the "const" storage-class-modifier is valid */
  #define YY_USE_CONST
  
! #else	/* ! __cplusplus */
  
+ #ifdef __STDC__
  
+ #ifdef __GNUC__
+ #include <stddef.h>
+ void *malloc( size_t );
+ void free( void* );
+ #else
+ #include <stdlib.h>
+ #endif	/* __GNUC__ */
+ 
+ #define YY_USE_PROTOS
+ #define YY_USE_CONST
+ 
+ #endif	/* __STDC__ */
+ #endif	/* ! __cplusplus */
+ 
+ 
  #ifdef __TURBOC__
  #define YY_USE_CONST
  #endif
***************
*** 61,67 ****
  #define YY_PROTO(proto) proto
  #else
  #define YY_PROTO(proto) ()
! /* there's no standard place to get these definitions */
  char *malloc();
  int free();
  int read();
--- 61,70 ----
  #define YY_PROTO(proto) proto
  #else
  #define YY_PROTO(proto) ()
! /* we can't get here if it's an ANSI C compiler, or a C++ compiler,
!  * so it's got to be a K&R compiler, and therefore there's no standard
!  * place from which to include these definitions
!  */
  char *malloc();
  int free();
  int read();