diff options
| author | unknown <joreland@mysql.com> | 2005-01-03 19:42:38 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-01-03 19:42:38 +0100 |
| commit | 8a0bfa019a8dd907a3631ead2e1761033ca4decc (patch) | |
| tree | c334ac3ad2b064a60bb7b2942b40096d24ca3b6a | |
| parent | c8cfe3d211366b353eaefe47a78817508d3dac9a (diff) | |
| parent | e197fa459d331be2027aa7ce8e4bf61a9da4f4f7 (diff) | |
| download | mariadb-git-8a0bfa019a8dd907a3631ead2e1761033ca4decc.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/mysql-4.1
| -rw-r--r-- | ndb/include/ndb_types.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/ndb/include/ndb_types.h b/ndb/include/ndb_types.h index 0d603cc2ab3..1284ace3bbc 100644 --- a/ndb/include/ndb_types.h +++ b/ndb/include/ndb_types.h @@ -30,31 +30,22 @@ typedef unsigned int Uint32; typedef unsigned int UintR; -#ifdef __SIZE_TYPE__ -typedef __SIZE_TYPE__ UintPtr; -#else -#include <ndb_global.h> -#ifdef HAVE_STDINT_H -#include <stdint.h> -#endif -#ifdef HAVE_INTTYPES_H -#include <inttypes.h> -#endif -#if defined(WIN32) || defined(NDB_WIN32) -typedef Uint32 UintPtr; -#else -typedef uintptr_t UintPtr; -#endif -#endif - #if defined(WIN32) || defined(NDB_WIN32) typedef unsigned __int64 Uint64; typedef signed __int64 Int64; -typedef UintPtr ssize_t; #else typedef unsigned long long Uint64; typedef signed long long Int64; #endif +#ifdef __SIZE_TYPE__ +typedef __SIZE_TYPE__ UintPtr; +#else +#if SIZEOF_CHARP == 4 +typedef Uint32 UintPtr; +#else +typedef Uint64 UintPtr; +#endif +#endif #endif |