~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-156

« back to all changes in this revision

Viewing changes to drizzled/execute/scanner.l

  • Committer: Continuous Integration
  • Date: 2013-01-29 04:41:35 UTC
  • mfrom: (2617.1.1 drizzle-7.2)
  • Revision ID: ci@drizzle.org-20130129044135-4280ihujaozod4ca
Merge lp:~brianaker/drizzle/fedora18-fix Build: jenkins-Drizzle-Builder-156

Show diffs side-by-side

added added

removed removed

Lines of Context:
41
41
 
42
42
#include <config.h>
43
43
#include <unistd.h>
44
 
#include <drizzled/execute/parser.h>  
45
 
#include <drizzled/execute/context.h>
46
 
#include <drizzled/execute/symbol.h>
47
 
#include <drizzled/lex_string.h>
 
44
 
 
45
#ifndef execute_HEADER_H
 
46
# define execute_HEADER_H 1
 
47
#endif
 
48
 
 
49
#include "drizzled/execute/common.h"
 
50
#include "drizzled/lex_string.h"
48
51
 
49
52
using namespace drizzled;
50
53
 
55
58
#pragma GCC diagnostic ignored "-Wmissing-declarations"
56
59
#endif
57
60
 
58
 
#define YY_EXTRA_TYPE ::drizzled::execute::Context*
 
61
#ifndef YY_EXTRA_TYPE
 
62
# define YY_EXTRA_TYPE drizzled::execute::Context*
 
63
#endif
59
64
 
60
65
}
61
66