summaryrefslogtreecommitdiff
path: root/innobase/include
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-04-20 15:18:46 +0300
committerunknown <monty@donna.mysql.fi>2001-04-20 15:18:46 +0300
commit4a7af05c7fdd23d5ec194531b6fdb5dcfb113868 (patch)
treea82d8683eb9e83050b873052f53cd7e717d2a572 /innobase/include
parentb61b56b2939eb45b89fa9de98f16bf4a6a158f51 (diff)
downloadmariadb-git-4a7af05c7fdd23d5ec194531b6fdb5dcfb113868.tar.gz
Portability fixes
BitKeeper/deleted/.del-compile-ia64-O0-sgicc~a4e0732013d6b602: Delete: BUILD/compile-ia64-O0-sgicc BitKeeper/deleted/.del-compile-ia64-O0~3a41dfebefc817d1: Delete: BUILD/compile-ia64-O0 BitKeeper/deleted/.del-compile-ia64-O2-sgicc~6ff796ecac337849: Delete: BUILD/compile-ia64-O2-sgicc BitKeeper/deleted/.del-compile-ia64-O2~87d13594c3599830: Delete: BUILD/compile-ia64-O2 BitKeeper/deleted/.del-compile-ia64-O6~c34e6b943b12c468: Delete: BUILD/compile-ia64-O6 Docs/manual.texi: Cleanup mysql-test/r/rpl000014.result: Change port number for comparison mysql-test/r/rpl000015.result: Change port number for comparison mysql-test/r/rpl000016.result: Change port number for comparison mysql-test/t/rpl000014.test: Change port number for comparison mysql-test/t/rpl000015.test: Change port number for comparison mysql-test/t/rpl000016.test: Change port number for comparison sql-bench/Results/ATIS-mysql-NT_4.0: New test results sql-bench/Results/RUN-mysql-NT_4.0: New test results sql-bench/Results/alter-table-mysql-NT_4.0: New test results sql-bench/Results/big-tables-mysql-NT_4.0: New test results sql-bench/Results/connect-mysql-NT_4.0: New test results sql-bench/Results/create-mysql-NT_4.0: New test results sql-bench/Results/insert-mysql-NT_4.0: New test results sql-bench/Results/select-mysql-NT_4.0: New test results sql-bench/Results/wisconsin-mysql-NT_4.0: New test results sql/slave.cc: Removed not used variable
Diffstat (limited to 'innobase/include')
-rw-r--r--innobase/include/ut0dbg.h2
-rw-r--r--innobase/include/ut0mem.h2
-rw-r--r--innobase/include/ut0ut.h5
3 files changed, 4 insertions, 5 deletions
diff --git a/innobase/include/ut0dbg.h b/innobase/include/ut0dbg.h
index a36b022e036..751609b244e 100644
--- a/innobase/include/ut0dbg.h
+++ b/innobase/include/ut0dbg.h
@@ -9,9 +9,9 @@ Created 1/30/1994 Heikki Tuuri
#ifndef ut0dbg_h
#define ut0dbg_h
+#include "univ.i"
#include <assert.h>
#include <stdlib.h>
-#include "univ.i"
#include "os0thread.h"
extern ulint ut_dbg_zero; /* This is used to eliminate
diff --git a/innobase/include/ut0mem.h b/innobase/include/ut0mem.h
index 4d266f34c17..fa46514fe16 100644
--- a/innobase/include/ut0mem.h
+++ b/innobase/include/ut0mem.h
@@ -9,9 +9,9 @@ Created 5/30/1994 Heikki Tuuri
#ifndef ut0mem_h
#define ut0mem_h
+#include "univ.i"
#include <string.h>
#include <stdlib.h>
-#include "univ.i"
UNIV_INLINE
void*
diff --git a/innobase/include/ut0ut.h b/innobase/include/ut0ut.h
index 05d4f455c58..f2c4781c167 100644
--- a/innobase/include/ut0ut.h
+++ b/innobase/include/ut0ut.h
@@ -9,10 +9,9 @@ Created 1/20/1994 Heikki Tuuri
#ifndef ut0ut_h
#define ut0ut_h
-#include <time.h>
-#include <ctype.h>
-
#include "univ.i"
+#include <time.h>
+#include <m_ctype.h>
typedef time_t ib_time_t;