summaryrefslogtreecommitdiff
path: root/innobase/pars
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2002-10-25 20:15:30 +0300
committerunknown <heikki@hundin.mysql.fi>2002-10-25 20:15:30 +0300
commitf4ebc48ecadd2bb96312683289f0420d252937e1 (patch)
tree86fa493af4e6f99e97f1f391988c708aba15927b /innobase/pars
parentad25c3b99f31c761b7916594196acf15692f43b7 (diff)
downloadmariadb-git-f4ebc48ecadd2bb96312683289f0420d252937e1.tar.gz
lexyy.c, pars0grm.c:
Include univ.i before any system headers to remove a large file compilation failure on AIX innobase/pars/pars0grm.c: Include univ.i before any system headers to remove a large file compilation failure on AIX innobase/pars/lexyy.c: Include univ.i before any system headers to remove a large file compilation failure on AIX
Diffstat (limited to 'innobase/pars')
-rw-r--r--innobase/pars/lexyy.c9
-rw-r--r--innobase/pars/pars0grm.c4
2 files changed, 10 insertions, 3 deletions
diff --git a/innobase/pars/lexyy.c b/innobase/pars/lexyy.c
index 0a333c726ff..81adf909d01 100644
--- a/innobase/pars/lexyy.c
+++ b/innobase/pars/lexyy.c
@@ -4,6 +4,8 @@
* $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
*/
+#include "univ.i"
+
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
@@ -606,13 +608,18 @@ How to make the InnoDB parser and lexer C files:
6. Remove the #include of unistd.h from about line 2500 of lexyy.c
+7. Move #include <math.h> in pars0grm.c after #include "univ.i" to remove
+ a large file compilation error on AIX.
+
+8. Move #include "univ.i" in lexyy.c to the file start to remove a large
+ file compilation error on AIX.
+
These instructions seem to work at least with bison-1.28 and flex-2.5.4 on
Linux.
*******************************************************/
#line 36 "pars0lex.l"
#define YYSTYPE que_node_t*
-#include "univ.i"
#include "pars0pars.h"
#include "pars0grm.h"
#include "pars0sym.h"
diff --git a/innobase/pars/pars0grm.c b/innobase/pars/pars0grm.c
index 1b7b31f6443..206534a5352 100644
--- a/innobase/pars/pars0grm.c
+++ b/innobase/pars/pars0grm.c
@@ -94,8 +94,6 @@
/* The value of the semantic attribute is a pointer to a query tree node
que_node_t */
-#include <math.h>
-
#include "univ.i"
#include "pars0pars.h"
#include "mem0mem.h"
@@ -103,6 +101,8 @@ que_node_t */
#include "que0que.h"
#include "row0sel.h"
+#include <math.h>
+
#define YYSTYPE que_node_t*
/* #define __STDC__ */