Commit 423241da authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0
parents 79e05c83 3c1b5f54

ndb/include/ndb_types.h

+10 −18
Original line number Diff line number Diff line
@@ -30,31 +30,23 @@ 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

ndb/test/tools/Makefile.am

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ ndbtest_PROGRAMS = hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hug 


# transproxy 



hugoCalculator_SOURCES = hugoCalculator.cpp

hugoFill_SOURCES = hugoFill.cpp

hugoLoad_SOURCES = hugoLoad.cpp

hugoLockRecords_SOURCES = hugoLockRecords.cpp