projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in local trunk
[awesomized/libmemcached]
/
libmemcached
/
options
/
scanner.h
diff --git
a/libmemcached/options/scanner.h
b/libmemcached/options/scanner.h
index 6d0b71e9bf3a1bbebc6936adf6f63471d5fe81dd..3e7b5aee09b3f8d86dd5c9cc9b6806bb5f065b5e 100644
(file)
--- a/
libmemcached/options/scanner.h
+++ b/
libmemcached/options/scanner.h
@@
-5,15
+5,15
@@
#line 6 "libmemcached/options/scanner.h"
#line 22 "libmemcached/options/scanner.l"
#line 6 "libmemcached/options/scanner.h"
#line 22 "libmemcached/options/scanner.l"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
-#pragma GCC diagnostic ignored "-Wsign-compare"
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-
+#include <libmemcached/common.h>
#include <libmemcached/options/context.h>
#include <libmemcached/options/parser.h>
#include <libmemcached/options/context.h>
#include <libmemcached/options/parser.h>
-#include <libmemcached/options/string.h>
#include <libmemcached/options/symbol.h>
#include <libmemcached/options/symbol.h>
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+
#define YY_EXTRA_TYPE Context*
#define YY_EXTRA_TYPE Context*
@@
-471,7
+471,7
@@
extern int config_lex \
#undef YY_DECL
#endif
#undef YY_DECL
#endif
-#line
218
"libmemcached/options/scanner.l"
+#line
196
"libmemcached/options/scanner.l"
#line 478 "libmemcached/options/scanner.h"
#line 478 "libmemcached/options/scanner.h"