diff options
| author | unknown <acurtis@poseidon.ndb.mysql.com> | 2005-11-07 16:30:03 +0100 |
|---|---|---|
| committer | unknown <acurtis@poseidon.ndb.mysql.com> | 2005-11-07 16:30:03 +0100 |
| commit | 6eb7f72be97708bc49112ef401bbb97f194f9054 (patch) | |
| tree | fc2d996bd9af1bab7a6303a5808ab384fcb14333 /storage | |
| parent | 6be5f8a340359cff3302d9e26c8620aff7a78938 (diff) | |
| parent | 6b3a9caef9b8cf42f8a706f778bba72db89cdd2b (diff) | |
| download | mariadb-git-6eb7f72be97708bc49112ef401bbb97f194f9054.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/m51new
configure.in:
Auto merged
storage/ndb/include/kernel/kernel_types.h:
Auto merged
sql/ha_ndbcluster.cc:
manual merge
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/include/kernel/kernel_types.h | 1 | ||||
| -rw-r--r-- | storage/ndb/include/ndb_global.h.in | 1 | ||||
| -rw-r--r-- | storage/ndb/include/ndb_types.h.in | 14 |
3 files changed, 10 insertions, 6 deletions
diff --git a/storage/ndb/include/kernel/kernel_types.h b/storage/ndb/include/kernel/kernel_types.h index 9b2178c4c84..3c6ba69494e 100644 --- a/storage/ndb/include/kernel/kernel_types.h +++ b/storage/ndb/include/kernel/kernel_types.h @@ -17,6 +17,7 @@ #ifndef NDB_KERNEL_TYPES_H #define NDB_KERNEL_TYPES_H +#include <my_config.h> #include <ndb_types.h> #include "ndb_limits.h" diff --git a/storage/ndb/include/ndb_global.h.in b/storage/ndb/include/ndb_global.h.in index 43f90e1f8b5..7d92ae76f83 100644 --- a/storage/ndb/include/ndb_global.h.in +++ b/storage/ndb/include/ndb_global.h.in @@ -17,6 +17,7 @@ #ifndef NDB_GLOBAL_H #define NDB_GLOBAL_H +#include <my_config.h> #include <ndb_types.h> #define NDB_PORT "@ndb_port@" diff --git a/storage/ndb/include/ndb_types.h.in b/storage/ndb/include/ndb_types.h.in index 2a5d576ffea..c657ce4f075 100644 --- a/storage/ndb/include/ndb_types.h.in +++ b/storage/ndb/include/ndb_types.h.in @@ -21,6 +21,8 @@ #ifndef NDB_TYPES_H #define NDB_TYPES_H +#include <my_config.h> + #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(_WIN64) #define NDB_SIZEOF_CHARP SIZEOF_CHARP #define NDB_SIZEOF_CHAR SIZEOF_CHAR @@ -31,12 +33,12 @@ typedef unsigned __int64 Uint64; typedef signed __int64 Int64; #else -#define NDB_SIZEOF_CHARP @NDB_SIZEOF_CHARP@ -#define NDB_SIZEOF_CHAR @NDB_SIZEOF_CHAR@ -#define NDB_SIZEOF_INT @NDB_SIZEOF_INT@ -#define NDB_SIZEOF_SHORT @NDB_SIZEOF_SHORT@ -#define NDB_SIZEOF_LONG @NDB_SIZEOF_LONG@ -#define NDB_SIZEOF_LONG_LONG @NDB_SIZEOF_LONG_LONG@ +#define NDB_SIZEOF_CHARP SIZEOF_CHARP +#define NDB_SIZEOF_CHAR SIZEOF_CHAR +#define NDB_SIZEOF_INT SIZEOF_INT +#define NDB_SIZEOF_SHORT SIZEOF_SHORT +#define NDB_SIZEOF_LONG SIZEOF_LONG +#define NDB_SIZEOF_LONG_LONG SIZEOF_LONG_LONG typedef unsigned long long Uint64; typedef signed long long Int64; #endif |