home *** CD-ROM | disk | FTP | other *** search
- diff +context=2 oflex-2.36/flexdef.h flex-2.36/flexdef.h
- *** oflex-2.36/flexdef.h Sun Mar 24 14:26:48 1991
- --- flex-2.36/flexdef.h Thu Mar 7 00:11:56 1991
- ***************
- *** 70,74 ****
- char *sprintf(); /* keep lint happy */
- #endif
- ! #ifdef SCO_UNIX
- void *memset();
- #else
- --- 70,74 ----
- char *sprintf(); /* keep lint happy */
- #endif
- ! #if defined(SCO_UNIX) || defined(GNUDOS)
- void *memset();
- #else
- ***************
- *** 126,129 ****
- --- 126,133 ----
- #endif
-
- + #ifdef GNUDOS
- + #define SHORT_FILE_NAMES
- + #endif
- +
- #define true 1
- #define false 0
- ***************
- *** 660,664 ****
- --- 664,673 ----
- * be YYSTYPE, but we can't easily get our hands on it.
- */
- + /* GNUDOS: bison uses unsigned long */
- + #ifndef GNUDOS
- extern int yylval;
- + #else
- + extern unsigned long yylval;
- + #endif
-
-
- ***************
- *** 867,871 ****
- --- 876,886 ----
- /* The Unix kernel calls used here */
-
- + #ifndef __GNUC__
- extern int read PROTO((int, char*, int));
- extern int unlink PROTO((char*));
- extern int write PROTO((int, char*, int));
- + #else
- + extern int read PROTO((int, void*, unsigned));
- + extern int unlink PROTO((const char*));
- + extern int write PROTO((int, const void*, unsigned));
- + #endif
- diff +context=2 oflex-2.36/main.c flex-2.36/main.c
- *** oflex-2.36/main.c Sun Mar 24 14:26:50 1991
- --- flex-2.36/main.c Thu Mar 7 00:11:56 1991
- ***************
- *** 554,559 ****
- static char skeleton_name_storage[400];
-
- ! skelname = skeleton_name_storage;
- ! (void) strcpy( skelname, DEFAULT_SKELETON_FILE );
- }
-
- --- 554,570 ----
- static char skeleton_name_storage[400];
-
- ! /* GNUDOS: use GCCLIB environment variable */
- ! #ifdef GNUDOS
- ! extern char *getenv();
- ! skelname = getenv("FLEX_SKELETON");
- ! if (!skelname) {
- ! #endif
- !
- ! skelname = skeleton_name_storage;
- ! (void) strcpy( skelname, DEFAULT_SKELETON_FILE );
- !
- ! #ifdef GNUDOS
- ! }
- ! #endif
- }
-
- diff +context=2 oflex-2.36/makefile flex-2.36/makefile
- *** oflex-2.36/makefile Sun Mar 24 14:26:50 1991
- --- flex-2.36/makefile Sun Mar 24 14:34:34 1991
- ***************
- *** 33,37 ****
- --- 33,43 ----
- # the first time around use "make first_flex"
-
- + # GNUDOS: set up for gcc
- + CC = gcc -DGNUDOS
- + MAKE = make
- + .c.o:
- + $(CC) $(CFLAGS) -c $<
-
- +
- # Installation targeting. Files will be installed under the tree rooted
- # at DESTDIR. User commands will be installed in BINDIR, library files
- ***************
- *** 106,115 ****
- first_flex:
- cp initscan.c scan.c
- ! $(MAKE) $(MFLAGS) flex
-
- parse.h parse.c : parse.y
- ! $(YACC) -d parse.y
- ! @mv y.tab.c parse.c
- ! @mv y.tab.h parse.h
-
- scan.c : scan.l
- --- 112,122 ----
- first_flex:
- cp initscan.c scan.c
- ! make $(MFLAGS) flex
-
- + # GNUDOS: use bison
- parse.h parse.c : parse.y
- ! bison -d parse.y
- ! @mv parse_tab.c parse.c
- ! @mv parse_tab.h parse.h
-
- scan.c : scan.l
-