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

move intptr from my_atomic.h to my_global.h

Browse Source
This commit is contained in:
unknown 2007-01-28 21:12:58 +01:00
parent 2a8ee9fb13
commit 6e1ba88418
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/my_atomic.h
View File

@ -134,14 +134,6 @@ make_atomic_swap(ptr)
#undef _atomic_h_cleanup_ #undef _atomic_h_cleanup_
#endif #endif
#if SIZEOF_CHARP == SIZEOF_INT
typedef int intptr;
#elif SIZEOF_CHARP == SIZEOF_LONG
typedef long intptr;
#else
#error
#endif
#define MY_ATOMIC_OK 0 #define MY_ATOMIC_OK 0
#define MY_ATOMIC_NOT_1CPU 1 #define MY_ATOMIC_NOT_1CPU 1
extern int my_atomic_initialize(); extern int my_atomic_initialize();

10
include/my_global.h
View File

@ -987,7 +987,7 @@ typedef long int32;
typedef unsigned long uint32; typedef unsigned long uint32;
#endif #endif
#else #else
#error "Neither int or long is of 4 bytes width" #error Neither int or long is of 4 bytes width
#endif #endif
#if !defined(HAVE_ULONG) && !defined(__USE_MISC) #if !defined(HAVE_ULONG) && !defined(__USE_MISC)
@ -1017,6 +1017,14 @@ typedef unsigned __int64 my_ulonglong;
typedef unsigned long long my_ulonglong; typedef unsigned long long my_ulonglong;
#endif #endif
#if SIZEOF_CHARP == SIZEOF_INT
typedef int intptr;
#elif SIZEOF_CHARP == SIZEOF_LONG
typedef long intptr;
#else
#error sizeof(void *) is neither sizeof(int) nor sizeof(long)
#endif
#ifdef USE_RAID #ifdef USE_RAID
/* /*
The following is done with a if to not get problems with pre-processors The following is done with a if to not get problems with pre-processors