diff options
author | Kenneth Graunke <kenneth@whitecape.org> | 2010-06-16 11:51:43 -0700 |
---|---|---|
committer | Kenneth Graunke <kenneth@whitecape.org> | 2010-06-21 11:25:30 -0700 |
commit | 254a485c33c9692f527e33c1423399ce99b1aa2b (patch) | |
tree | 0b125e8b3d8656ed8e3d34e2bca64aa4e9ebfa70 | |
parent | 6f510a49d2f3271432844d6b7e2bfe459b2126d4 (diff) |
Specify %option prefix="glcpp_" in the source code, not the Makefile.
-rw-r--r-- | glcpp/Makefile | 2 | ||||
-rw-r--r-- | glcpp/glcpp-lex.l | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/glcpp/Makefile b/glcpp/Makefile index 3fb44ac3b2..1578a8ee30 100644 --- a/glcpp/Makefile +++ b/glcpp/Makefile @@ -13,7 +13,7 @@ glcpp: glcpp.o glcpp-lex.o glcpp-parse.o hash_table.o xtalloc.o bison --debug --defines=$*.h --output=$*.c $^ %.c: %.l - flex --prefix=glcpp_ --outfile=$@ $< + flex --outfile=$@ $< glcpp-lex.c: glcpp-parse.h diff --git a/glcpp/glcpp-lex.l b/glcpp/glcpp-lex.l index 0d9a75415a..cc5f28f8f8 100644 --- a/glcpp/glcpp-lex.l +++ b/glcpp/glcpp-lex.l @@ -31,6 +31,7 @@ %option reentrant noyywrap %option extra-type="glcpp_parser_t *" +%option prefix="glcpp_" SPACE [[:space:]] NONSPACE [^[:space:]] |