Commit 65c2ab11 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-4.1


ndb/include/ndb_global.h.in:
  Auto merged
parents 8a0bfa01 9ecd9ac6

ndb/include/ndb_global.h.in

+36 −0
Original line number Diff line number Diff line
@@ -31,12 +31,48 @@ 
#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)

#error "Invalid define for Uint8"

#endif



#if ! (SIZEOF_INT == 4)

#error "Invalid define for Uint32"

#endif



#if ! (SIZEOF_LONG_LONG == 8)

#error "Invalid define for Uint64"

#endif



#include <my_alarm.h>



#ifdef _AIX

ndb/include/ndb_types.h

+1 −26
Original line number Diff line number Diff line
@@ -21,31 +21,6 @@ 
#ifndef NDB_TYPES_H

#define NDB_TYPES_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;



#if defined(WIN32) || defined(NDB_WIN32)

typedef unsigned __int64 Uint64;

typedef   signed __int64 Int64;

#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

#include "ndb_global.h"



#endif