blob: e24abc0531bc4cb1ef3e22d28e0c4322c92f0fa6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
|
Description: Quick fix for flex.
See http://flex.sourceforge.net/manual/Lex-and-Posix.html
Index: libsec/usr/src/lib/libsec/common/acl_lex.l
===================================================================
--- libsec.orig/usr/src/lib/libsec/common/acl_lex.l 2012-10-08 04:25:42.000000000 +0400
+++ libsec/usr/src/lib/libsec/common/acl_lex.l 2012-10-27 20:08:20.931366794 +0400
@@ -29,17 +29,15 @@
#include <errno.h>
#include "acl.tab.h"
-#ifdef input
-#undef input
-#endif
-
-#ifdef unput
-#undef unput
-#endif
+
+#define YY_INPUT(buf,result,max_size) \
+{ \
+ int c; \
+ c = yybuf[yybufpos++]; \
+ result = (c == 0) ? YY_NULL : (buf[0] = c, 1); \
+}
int grab_string(char *terminators);
-static int input();
-static void unput(int);
int
yyerror(const char *s)
@@ -807,31 +805,6 @@
return (error);
}
-static int
-input(void)
-{
- int c;
-
- c = yybuf[yybufpos++];
- if (c == '\0') {
- return (EOF);
- }
-
- return (c);
-}
-
-static void
-unput(int c)
-{
- if (c == '\0') {
- return;
- }
-
- if (yybufpos > 0) {
- --yybufpos;
- }
-}
-
/*
* return ACE entry type
*/
|
