mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
bug#7626 - ndb UintPtr handling
ndb/include/ndb_types.h: redo UintPtr handling
This commit is contained in:
parent
b181f610e1
commit
e197fa459d
1 changed files with 9 additions and 18 deletions
|
@ -30,31 +30,22 @@ typedef unsigned int Uint32;
|
||||||
|
|
||||||
typedef unsigned int UintR;
|
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)
|
#if defined(WIN32) || defined(NDB_WIN32)
|
||||||
typedef unsigned __int64 Uint64;
|
typedef unsigned __int64 Uint64;
|
||||||
typedef signed __int64 Int64;
|
typedef signed __int64 Int64;
|
||||||
typedef UintPtr ssize_t;
|
|
||||||
#else
|
#else
|
||||||
typedef unsigned long long Uint64;
|
typedef unsigned long long Uint64;
|
||||||
typedef signed long long Int64;
|
typedef signed long long Int64;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __SIZE_TYPE__
|
||||||
|
typedef __SIZE_TYPE__ UintPtr;
|
||||||
|
#else
|
||||||
|
#if SIZEOF_CHARP == 4
|
||||||
|
typedef Uint32 UintPtr;
|
||||||
|
#else
|
||||||
|
typedef Uint64 UintPtr;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Reference in a new issue