1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb

Browse Source 
into mc05.(none):/space2/tomas/mysql-4.1
This commit is contained in:
unknown 2004-05-13 13:45:15 +02:00
commit df41e3d55d
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ndb/Defs.mk
View File

@ -40,7 +40,6 @@ SHLIBEXT := sl
endif endif
ifeq ($(NDB_OS), MACOSX) ifeq ($(NDB_OS), MACOSX)
CCFLAGS_TOP += -DNDBOUT_UINTPTR
SHLIBEXT := dylib SHLIBEXT := dylib
endif endif

10
ndb/include/ndb_types.h
View File

@ -18,8 +18,8 @@
* @file ndb_types.h * @file ndb_types.h
*/ */
#ifndef SYS_TYPES_H #ifndef NDB_TYPES_H
#define SYS_TYPES_H #define NDB_TYPES_H
typedef char Int8; typedef char Int8;
typedef unsigned char Uint8; typedef unsigned char Uint8;
@ -33,7 +33,13 @@ typedef unsigned int UintR;
#ifdef __SIZE_TYPE__ #ifdef __SIZE_TYPE__
typedef __SIZE_TYPE__ UintPtr; typedef __SIZE_TYPE__ UintPtr;
#else #else
#include <my_config.h>
#ifdef HAVE_STDINT_H
#include <stdint.h> #include <stdint.h>
#endif
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif
typedef uintptr_t UintPtr; typedef uintptr_t UintPtr;
#endif #endif

12
ndb/src/common/portlib/unix/NdbMem.c
View File

@ -54,18 +54,18 @@ void NdbMem_Free(void* ptr)
int NdbMem_MemLockAll(){ int NdbMem_MemLockAll(){
#ifndef HAVE_MLOCKALL #if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT)
return -1;
#else
return mlockall(MCL_CURRENT); return mlockall(MCL_CURRENT);
#else
return -1;
#endif #endif
} }
int NdbMem_MemUnlockAll(){ int NdbMem_MemUnlockAll(){
#ifndef HAVE_MLOCKALL #if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT)
return -1;
#else
return munlockall(); return munlockall();
#else
return -1;
#endif #endif
} }