summaryrefslogtreecommitdiff
path: root/innobase/pars
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-08-24 16:32:16 +0300
committerunknown <monty@mashka.mysql.fi>2002-08-24 16:32:16 +0300
commite9b7fc61293a291d48ef7cb51e53b4a446220105 (patch)
treeaabd2378e79efbd8c2610d7dabacdfd1dca7e00c /innobase/pars
parentb3988cb8fe524fcf421c39ff553657dc02414859 (diff)
downloadmariadb-git-e9b7fc61293a291d48ef7cb51e53b4a446220105.tar.gz
Portability fix for AIX 4.3 powerpc with gcc 3.2
BitKeeper/deleted/.del-rpl_compat.test~5f6ba955e02aa95f: deleted old test Docs/manual.texi: Added comment about shared libraries to upgrade section
Diffstat (limited to 'innobase/pars')
-rw-r--r--innobase/pars/lexyy.c1
-rw-r--r--innobase/pars/pars0grm.c3
-rw-r--r--innobase/pars/pars0grm.y3
-rw-r--r--innobase/pars/pars0lex.l3
4 files changed, 6 insertions, 4 deletions
diff --git a/innobase/pars/lexyy.c b/innobase/pars/lexyy.c
index 0a333c726ff..f7edc9d195f 100644
--- a/innobase/pars/lexyy.c
+++ b/innobase/pars/lexyy.c
@@ -8,6 +8,7 @@
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
+#include "univ.i"
#include <stdio.h>
diff --git a/innobase/pars/pars0grm.c b/innobase/pars/pars0grm.c
index 1b7b31f6443..05b75398084 100644
--- a/innobase/pars/pars0grm.c
+++ b/innobase/pars/pars0grm.c
@@ -94,9 +94,8 @@
/* The value of the semantic attribute is a pointer to a query tree node
que_node_t */
-#include <math.h>
-
#include "univ.i"
+#include <math.h> /* Can't be before univ.i */
#include "pars0pars.h"
#include "mem0mem.h"
#include "que0types.h"
diff --git a/innobase/pars/pars0grm.y b/innobase/pars/pars0grm.y
index 67289222594..a142d04301e 100644
--- a/innobase/pars/pars0grm.y
+++ b/innobase/pars/pars0grm.y
@@ -14,9 +14,8 @@ the InnoDB parser.
/* The value of the semantic attribute is a pointer to a query tree node
que_node_t */
-#include <math.h>
-
#include "univ.i"
+#include <math.h> /* Can't be before univ.i */
#include "pars0pars.h"
#include "mem0mem.h"
#include "que0types.h"
diff --git a/innobase/pars/pars0lex.l b/innobase/pars/pars0lex.l
index e9b39861dd2..97875ffcc45 100644
--- a/innobase/pars/pars0lex.l
+++ b/innobase/pars/pars0lex.l
@@ -28,6 +28,9 @@ 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. Add '#include "univ.i"' before #include <stdio.h> in lexyy.c
+ (Needed for AIX)
+
These instructions seem to work at least with bison-1.28 and flex-2.5.4 on
Linux.
*******************************************************/