Merge in local trunk

[m6w6/libmemcached] / libmemcached / options / scanner.h

diff --git a/libmemcached/options/scanner.h b/libmemcached/options/scanner.h
index 1742031a2adb77013caeb89a43c435e22099821d..3e7b5aee09b3f8d86dd5c9cc9b6806bb5f065b5e 100644 (file)
--- a/libmemcached/options/scanner.h
+++ b/libmemcached/options/scanner.h
@@ -8,7 +8,6 @@
 #include <libmemcached/common.h>
 #include <libmemcached/options/context.h>
 #include <libmemcached/options/parser.h>
-#include <libmemcached/options/string.h>
 #include <libmemcached/options/symbol.h>
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
@@ -20,7 +19,7 @@
 
 
 
-#line 24 "libmemcached/options/scanner.h"
+#line 23 "libmemcached/options/scanner.h"
 
 #define  YY_INT_ALIGNED short int
 
@@ -472,9 +471,9 @@ extern int config_lex \
 #undef YY_DECL
 #endif
 
-#line 197 "libmemcached/options/scanner.l"
+#line 196 "libmemcached/options/scanner.l"
 
 
-#line 479 "libmemcached/options/scanner.h"
+#line 478 "libmemcached/options/scanner.h"
 #undef config_IN_HEADER
 #endif /* config_HEADER_H */