diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-05-25 16:24:13 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2004-05-25 16:24:13 +0000 |
| commit | 6a0e10cfe30bec9bc3b5768f5fe804304462bd2e (patch) | |
| tree | db715b03f8136a5cb2e21164aad1016cf2466212 /source/include/includes.h | |
| parent | 6b468696500391af9153dc1ddbedfb5d39d6fac8 (diff) | |
| download | samba-6a0e10cfe30bec9bc3b5768f5fe804304462bd2e.tar.gz samba-6a0e10cfe30bec9bc3b5768f5fe804304462bd2e.tar.xz samba-6a0e10cfe30bec9bc3b5768f5fe804304462bd2e.zip | |
r884: convert samba4 to use [u]int32_t instead of [u]int32
metze
Diffstat (limited to 'source/include/includes.h')
| -rw-r--r-- | source/include/includes.h | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/source/include/includes.h b/source/include/includes.h index b6be02155e7..e6593754ed1 100644 --- a/source/include/includes.h +++ b/source/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. */ |