]>
Commit | Line | Data |
---|---|---|
5d8d9de9 | 1 | --- flex-2.5.4/initscan.c.broken Sat Sep 30 16:50:31 2000 |
2 | +++ flex-2.5.4/initscan.c Sat Sep 30 16:51:34 2000 | |
3 | @@ -10,7 +10,7 @@ | |
4 | #define YY_FLEX_MINOR_VERSION 5 | |
5 | ||
6 | #include <stdio.h> | |
7 | - | |
8 | +#include <unistd.h> | |
9 | ||
10 | /* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */ | |
11 | #ifdef c_plusplus | |
12 | @@ -23,7 +23,6 @@ | |
13 | #ifdef __cplusplus | |
14 | ||
15 | #include <stdlib.h> | |
16 | -#include <unistd.h> | |
17 | ||
18 | /* Use prototypes in function declarations. */ | |
19 | #define YY_USE_PROTOS | |
20 | @@ -3310,12 +3309,6 @@ | |
21 | yy_flex_free( (void *) b ); | |
22 | } | |
23 | ||
24 | - | |
25 | -#ifndef YY_ALWAYS_INTERACTIVE | |
26 | -#ifndef YY_NEVER_INTERACTIVE | |
27 | -extern int isatty YY_PROTO(( int )); | |
28 | -#endif | |
29 | -#endif | |
30 | ||
31 | #ifdef YY_USE_PROTOS | |
32 | void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) | |
33 | --- flex-2.5.4/flex.skl.broken Sat Sep 30 16:51:05 2000 | |
34 | +++ flex-2.5.4/flex.skl Sat Sep 30 16:52:24 2000 | |
35 | @@ -10,6 +10,7 @@ | |
36 | ||
37 | %- | |
38 | #include <stdio.h> | |
39 | +#include <unistd.h> | |
40 | %* | |
41 | ||
42 | ||
43 | @@ -27,7 +28,6 @@ | |
44 | %+ | |
45 | class istream; | |
46 | %* | |
47 | -#include <unistd.h> | |
48 | ||
49 | /* Use prototypes in function declarations. */ | |
50 | #define YY_USE_PROTOS | |
51 | @@ -1177,11 +1177,6 @@ | |
52 | ||
53 | ||
54 | %- | |
55 | -#ifndef YY_ALWAYS_INTERACTIVE | |
56 | -#ifndef YY_NEVER_INTERACTIVE | |
57 | -extern int isatty YY_PROTO(( int )); | |
58 | -#endif | |
59 | -#endif | |
60 | ||
61 | #ifdef YY_USE_PROTOS | |
62 | void yy_init_buffer( YY_BUFFER_STATE b, FILE *file ) | |
63 | @@ -1192,7 +1187,6 @@ | |
64 | #endif | |
65 | ||
66 | %+ | |
67 | -extern "C" int isatty YY_PROTO(( int )); | |
68 | void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file ) | |
69 | %* | |
70 | ||
71 | --- flex-2.5.4/skel.c.broken Sat Sep 30 16:52:34 2000 | |
72 | +++ flex-2.5.4/skel.c Sat Sep 30 16:53:15 2000 | |
73 | @@ -15,6 +15,7 @@ | |
74 | "", | |
75 | "%-", | |
76 | "#include <stdio.h>", | |
77 | + "#include <unistd.h>", | |
78 | "%*", | |
79 | "", | |
80 | "", | |
81 | @@ -32,7 +33,6 @@ | |
82 | "%+", | |
83 | "class istream;", | |
84 | "%*", | |
85 | - "#include <unistd.h>", | |
86 | "", | |
87 | "/* Use prototypes in function declarations. */", | |
88 | "#define YY_USE_PROTOS", | |
89 | @@ -1182,11 +1182,6 @@ | |
90 | "", | |
91 | "", | |
92 | "%-", | |
93 | - "#ifndef YY_ALWAYS_INTERACTIVE", | |
94 | - "#ifndef YY_NEVER_INTERACTIVE", | |
95 | - "extern int isatty YY_PROTO(( int ));", | |
96 | - "#endif", | |
97 | - "#endif", | |
98 | "", | |
99 | "#ifdef YY_USE_PROTOS", | |
100 | "void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )", | |
101 | @@ -1197,7 +1192,6 @@ | |
102 | "#endif", | |
103 | "", | |
104 | "%+", | |
105 | - "extern \"C\" int isatty YY_PROTO(( int ));", | |
106 | "void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )", | |
107 | "%*", | |
108 | "", |