diff options
Diffstat (limited to 'ndb/include/ndb_global.h.in')
| -rw-r--r-- | ndb/include/ndb_global.h.in | 33 |
1 files changed, 5 insertions, 28 deletions
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 |