From 6e1ba88418887369ca71b49222c6fd66335bbe0c Mon Sep 17 00:00:00 2001
From: unknown <serg@janus.mylan>
Date: Sun, 28 Jan 2007 21:12:58 +0100
Subject: move intptr from my_atomic.h to my_global.h

---
 include/my_atomic.h |  8 --------
 include/my_global.h | 10 +++++++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/my_atomic.h b/include/my_atomic.h
index 7b066e9b529..a1347d26401 100644
--- a/include/my_atomic.h
+++ b/include/my_atomic.h
@@ -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();
diff --git a/include/my_global.h b/include/my_global.h
index f758352b46c..fe60b1b8989 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -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
-- 
cgit v1.2.1