Commit e23ba8ea authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1-fix

into mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndb_types.h:
  Auto merged
parents 423241da e197fa45
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -48,5 +48,14 @@ typedef Uint64 UintPtr;
#endif
#endif

#ifdef __SIZE_TYPE__
typedef __SIZE_TYPE__ UintPtr;
#else
#if SIZEOF_CHARP == 4
typedef Uint32 UintPtr;
#else
typedef Uint64 UintPtr;
#endif
#endif

#endif