Commit 6e1ba884 authored by unknown's avatar unknown
Browse files

move intptr from my_atomic.h to my_global.h

parent 2a8ee9fb

include/my_atomic.h

+0 −8
Original line number Diff line number Diff line
@@ -134,14 +134,6 @@ make_atomic_swap(ptr) 
#undef _atomic_h_cleanup_

#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_NOT_1CPU 1

extern int my_atomic_initialize();

include/my_global.h

+9 −1
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ typedef long int32; 
typedef unsigned long uint32;

#endif

#else

#error "Neither int or long is of 4 bytes width"

#error Neither int or long is of 4 bytes width

#endif



#if !defined(HAVE_ULONG) && !defined(__USE_MISC)
@@ -1017,6 +1017,14 @@ typedef unsigned __int64 my_ulonglong; 
typedef unsigned long long my_ulonglong;

#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

/*

  The following is done with a if to not get problems with pre-processors