r884: convert samba4 to use [u]int32_t instead of [u]int32

[samba.git] / source4 / include / includes.h

diff --git a/source4/include/includes.h b/source4/include/includes.h
index b6be02155e79748c71887a473e860d24c3f32666..e6593754ed133f710da1eb08a340ae1192c33c13 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -443,7 +443,7 @@ typedef int socklen_t;
 #endif
 
 /*
-   Samba needs type definitions for int16, int32, uint16 and uint32.
+   Samba needs type definitions for int16, int32_t, uint16 and uint32_t.
 
    Normally these are signed and unsigned 16 and 32 bit integers, but
    they actually only need to be at least 16 and 32 bits
@@ -473,40 +473,21 @@ typedef int socklen_t;
 #endif
 
 #if !defined(int32)
-#if (SIZEOF_INT == 4)
-#define int32 int
-#elif (SIZEOF_LONG == 4)
-#define int32 long
-#elif (SIZEOF_SHORT == 4)
-#define int32 short
-#else
-/* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */
-#define int32 int
-#endif
+#define int32 int32_t
 #endif
 
-
 #if !defined(uint32)
-#if (SIZEOF_INT == 4)
-#define uint32 unsigned int
-#elif (SIZEOF_LONG == 4)
-#define uint32 unsigned long
-#elif (SIZEOF_SHORT == 4)
-#define uint32 unsigned short
-#else
-/* uggh - no 32 bit type?? probably a CRAY. just hope this works ... */
-#define uint32 unsigned
+#define uint32 uint32_t
 #endif
+
+#if !defined(int64)
+#define int64 int64_t
 #endif
 
 #if !defined(uint64)
 #define uint64 uint64_t
 #endif
 
-#if !defined(int64)
-#define int64 int64_t
-#endif
-
 /*
  * Types for devices, inodes and offsets.
  */