mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into mysql.com:/home/jonas/src/mysql-5.0
This commit is contained in:
joreland@mysql.com 2005-01-03 20:12:07 +01:00
commit 14b66b19e4
2 changed files with 37 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ndb/include/ndb_global.h.in
View file

@ -31,12 +31,48 @@
#define HAVE_STRCASECMP #define HAVE_STRCASECMP
#define strcasecmp _strcmpi #define strcasecmp _strcmpi
#pragma warning(disable: 4503 4786) #pragma warning(disable: 4503 4786)
typedef unsigned __int64 Uint64;
typedef signed __int64 Int64;
#else #else
#undef NDB_WIN32 #undef NDB_WIN32
#define DIR_SEPARATOR "/" #define DIR_SEPARATOR "/"
typedef unsigned long long Uint64;
typedef signed long long Int64;
#endif #endif
#include <my_global.h> #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> #include <my_alarm.h>
#ifdef _AIX #ifdef _AIX

27
ndb/include/ndb_types.h
View file

@ -21,32 +21,7 @@
#ifndef NDB_TYPES_H #ifndef NDB_TYPES_H
#define NDB_TYPES_H #define NDB_TYPES_H
typedef signed char Int8; #include "ndb_global.h"
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
#ifdef __SIZE_TYPE__ #ifdef __SIZE_TYPE__
typedef __SIZE_TYPE__ UintPtr; typedef __SIZE_TYPE__ UintPtr;