diff options
| -rw-r--r-- | configure.in | 19 | ||||
| -rw-r--r-- | ndb/include/ndb_global.h.in | 33 | ||||
| -rw-r--r-- | ndb/include/ndb_types.h | 27 | ||||
| -rw-r--r-- | ndb/include/ndb_types.h.in | 81 |
4 files changed, 104 insertions, 56 deletions
diff --git a/configure.in b/configure.in index c307cd03da9..47ac06706b2 100644 --- a/configure.in +++ b/configure.in @@ -1770,6 +1770,7 @@ examine config.log for possible errors. If you want to report this, use 'scripts/mysqlbug' and include at least the last 20 rows from config.log!]) fi AC_CHECK_SIZEOF(char*, 4) +AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(int, 4) if test "$ac_cv_sizeof_int" -eq 0 then @@ -2723,11 +2724,26 @@ then fi AC_SUBST([ndb_bin_am_ldflags]) AC_SUBST([ndb_opt_subdirs]) + +NDB_SIZEOF_CHARP="$ac_cv_sizeof_charp" +NDB_SIZEOF_CHAR="$ac_cv_sizeof_char" +NDB_SIZEOF_SHORT="$ac_cv_sizeof_short" +NDB_SIZEOF_INT="$ac_cv_sizeof_int" +NDB_SIZEOF_LONG="$ac_cv_sizeof_long" +NDB_SIZEOF_LONG_LONG="$ac_cv_sizeof_long_long" +AC_SUBST([NDB_SIZEOF_CHARP]) +AC_SUBST([NDB_SIZEOF_CHAR]) +AC_SUBST([NDB_SIZEOF_SHORT]) +AC_SUBST([NDB_SIZEOF_INT]) +AC_SUBST([NDB_SIZEOF_LONG]) +AC_SUBST([NDB_SIZEOF_LONG_LONG]) + AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl ndb/src/Makefile ndb/src/common/Makefile dnl ndb/docs/Makefile dnl ndb/tools/Makefile dnl - ndb/src/common/debugger/Makefile ndb/src/common/debugger/signaldata/Makefile dnl + ndb/src/common/debugger/Makefile dnl + ndb/src/common/debugger/signaldata/Makefile dnl ndb/src/common/portlib/Makefile dnl ndb/src/common/util/Makefile dnl ndb/src/common/logger/Makefile dnl @@ -2766,6 +2782,7 @@ AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl ndb/test/tools/Makefile dnl ndb/test/run-test/Makefile mysql-test/ndb/Makefile dnl ndb/include/ndb_version.h ndb/include/ndb_global.h dnl + ndb/include/ndb_types.h dnl ) fi diff --git a/ndb/include/ndb_global.h.in b/ndb/include/ndb_global.h.in index d7a5cb1b1cf..dd1d1c05db8 100644 --- a/ndb/include/ndb_global.h.in +++ b/ndb/include/ndb_global.h.in @@ -14,8 +14,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef NDBGLOBAL_H -#define NDBGLOBAL_H +#ifndef NDB_GLOBAL_H +#define NDB_GLOBAL_H #include <ndb_types.h> @@ -31,45 +31,22 @@ #define HAVE_STRCASECMP #define strcasecmp _strcmpi #pragma warning(disable: 4503 4786) -typedef unsigned __int64 Uint64; -typedef signed __int64 Int64; #else #undef NDB_WIN32 #define DIR_SEPARATOR "/" -typedef unsigned long long Uint64; -typedef signed long long Int64; #endif #include <my_global.h> -typedef signed char Int8; -typedef unsigned char Uint8; -typedef signed short Int16; -typedef unsigned short Uint16; -typedef signed int Int32; -typedef unsigned int Uint32; - -typedef unsigned int UintR; - -#ifdef __SIZE_TYPE__ -typedef __SIZE_TYPE__ UintPtr; -#elif SIZEOF_CHARP == 4 -typedef Uint32 UintPtr; -#elif SIZEOF_CHARP == 8 -typedef Uint64 UintPtr; -#else -#error "Unknown size of (char *)" -#endif - -#if ! (SIZEOF_CHAR == 1) +#if ! (NDB_SIZEOF_CHAR == SIZEOF_CHAR) #error "Invalid define for Uint8" #endif -#if ! (SIZEOF_INT == 4) +#if ! (NDB_SIZEOF_INT == SIZEOF_INT) #error "Invalid define for Uint32" #endif -#if ! (SIZEOF_LONG_LONG == 8) +#if ! (NDB_SIZEOF_LONG_LONG == SIZEOF_LONG_LONG) #error "Invalid define for Uint64" #endif diff --git a/ndb/include/ndb_types.h b/ndb/include/ndb_types.h deleted file mode 100644 index 300765cb775..00000000000 --- a/ndb/include/ndb_types.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (C) 2003 MySQL AB - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -/** - * @file ndb_types.h - */ - -#ifndef NDB_TYPES_H -#define NDB_TYPES_H - -#include "ndb_global.h" -#include "ndb_constants.h" - -#endif diff --git a/ndb/include/ndb_types.h.in b/ndb/include/ndb_types.h.in new file mode 100644 index 00000000000..2a5d576ffea --- /dev/null +++ b/ndb/include/ndb_types.h.in @@ -0,0 +1,81 @@ +/* Copyright (C) 2003 MySQL AB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +/** + * @file ndb_types.h + */ + +#ifndef NDB_TYPES_H +#define NDB_TYPES_H + +#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(_WIN64) +#define NDB_SIZEOF_CHARP SIZEOF_CHARP +#define NDB_SIZEOF_CHAR SIZEOF_CHAR +#define NDB_SIZEOF_SHORT 2 +#define NDB_SIZEOF_INT SIZEOF_INT +#define NDB_SIZEOF_LONG SIZEOF_LONG +#define NDB_SIZEOF_LONG_LONG SIZEOF_LONG_LONG +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@ +typedef unsigned long long Uint64; +typedef signed long long Int64; +#endif + +typedef signed char Int8; +typedef unsigned char Uint8; +typedef signed short Int16; +typedef unsigned short Uint16; +typedef signed int Int32; +typedef unsigned int Uint32; + +typedef unsigned int UintR; + +#ifdef __SIZE_TYPE__ + typedef __SIZE_TYPE__ UintPtr; +#elif NDB_SIZEOF_CHARP == 4 + typedef Uint32 UintPtr; +#elif NDB_SIZEOF_CHARP == 8 + typedef Uint64 UintPtr; +#else + #error "Unknown size of (char *)" +#endif + +#if ! (NDB_SIZEOF_CHAR == 1) +#error "Invalid define for Uint8" +#endif + +#if ! (NDB_SIZEOF_SHORT == 2) +#error "Invalid define for Uint16" +#endif + +#if ! (NDB_SIZEOF_INT == 4) +#error "Invalid define for Uint32" +#endif + +#if ! (NDB_SIZEOF_LONG_LONG == 8) +#error "Invalid define for Uint64" +#endif + +#include "ndb_constants.h" + +#endif |