diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-05-25 16:24:13 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:15 -0500 |
| commit | f9d8f8843dc0ab8c9d59abde7222e0f118b86b5d (patch) | |
| tree | 8c6360be102dee63e893526ac7128e9cd52d362c /source4/include/includes.h | |
| parent | 59e739a2f9f4b10f5f6184ef397f034d09959f26 (diff) | |
| download | samba-f9d8f8843dc0ab8c9d59abde7222e0f118b86b5d.tar.gz samba-f9d8f8843dc0ab8c9d59abde7222e0f118b86b5d.tar.bz2 samba-f9d8f8843dc0ab8c9d59abde7222e0f118b86b5d.zip | |
r884: convert samba4 to use [u]int32_t instead of [u]int32
metze
(This used to be commit 0e5517d937a2eb7cf707991d1c7498c1ab456095)
Diffstat (limited to 'source4/include/includes.h')
| -rw-r--r-- | source4/include/includes.h | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index b6be02155e..e6593754ed 100644 --- 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. */ |