Path: utzoo!utgpu!news-server.csri.toronto.edu!cs.utexas.edu!uwm.edu!rpi!batcomputer!cornell!vern
From: vern@fjalar.cs.cornell.edu (Vern Paxson)
Newsgroups: comp.sources.bugs
Subject: flex 2.3 patch #3
Summary: patch #2 is incomplete; fixes gcc compilation problems
Message-ID: <44119@cornell.UUCP>
Date: 3 Aug 90 18:31:13 GMT
References: <44065@cornell.UUCP>
Sender: nobody@cornell.UUCP
Reply-To: vern@cs.cornell.edu (Vern Paxson)
Distribution: comp
Organization: Cornell Univ. CS Dept, Ithaca NY
Lines: 98

Unfortunately I didn't get flex 2.3 patch #2 quite right.  Here is
patch #3 (to be applied after #2) which should be the final word on
fixing things so flex can be built without errors using gcc.  Thanks
to Paul Eggert for catching this problem.

		Vern

diff -c Patch-2/Changes Patch-3/Changes
*** Patch-2/Changes	Thu Aug  2 01:09:22 1990
--- Patch-3/Changes	Fri Aug  3 14:17:00 1990
***************
*** 1,3 ****
--- 1,9 ----
+ Changes between 2.3 Patch #3 (03Aug90) and original 2.3 release:
+ 
+ 	- Correction to patch #2 for gcc compilation; thanks goes to
+ 	  Paul Eggert for catching this.
+ 
+ 
  Changes between 2.3 Patch #2 (02Aug90) and original 2.3 release:
  
  	- Fixed (hopefully) headaches involving declaring malloc()
diff -c Patch-2/flex.skel Patch-3/flex.skel
*** Patch-2/flex.skel	Thu Aug  2 01:09:23 1990
--- Patch-3/flex.skel	Fri Aug  3 14:17:00 1990
***************
*** 1,7 ****
  /* A lexical scanner generated by flex */
  
  /* scanner skeleton version:
!  * $Header: /usr/fsys/odin/a/vern/flex/RCS/flex.skel,v 2.15 90/08/02 01:01:07 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
***************
*** 33,39 ****
  #ifdef __STDC__
  
  #ifdef __GNUC__
! void *malloc( unsigned );
  void free( void* );
  #else
  #include <stdlib.h>
--- 33,40 ----
  #ifdef __STDC__
  
  #ifdef __GNUC__
! #include <stddef.h>
! void *malloc( size_t );
  void free( void* );
  #else
  #include <stdlib.h>
diff -c Patch-2/flexdef.h Patch-3/flexdef.h
*** Patch-2/flexdef.h	Thu Aug  2 00:42:54 1990
--- Patch-3/flexdef.h	Fri Aug  3 14:18:08 1990
***************
*** 26,32 ****
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
! /* @(#) $Header: /usr/fsys/odin/a/vern/flex/RCS/flexdef.h,v 2.9 90/08/02 00:31:02 vern Exp $ (LBL) */
  
  #ifndef FILE
  #include <stdio.h>
--- 26,32 ----
   * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
   */
  
! /* @(#) $Header: /usr/fsys/odin/a/vern/flex/RCS/flexdef.h,v 2.10 90/08/03 14:09:52 vern Exp $ (LBL) */
  
  #ifndef FILE
  #include <stdio.h>
***************
*** 93,99 ****
  #ifdef __STDC__
  
  #ifdef __GNUC__
! void *malloc( unsigned );
  void free( void* );
  #else
  #include <stdlib.h>
--- 93,100 ----
  #ifdef __STDC__
  
  #ifdef __GNUC__
! #include <stddef.h>
! void *malloc( size_t );
  void free( void* );
  #else
  #include <stdlib.h>