diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-05-25 17:24:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:16 -0500 |
| commit | f88bf54c7f6d1c2ef833047eb8327953c304b5ff (patch) | |
| tree | 07da4ab8641b2200eaca5b5ea9adba26b0712277 /source4/include/includes.h | |
| parent | f2ad98a165cdec6d344a96aeb21a38518a10720a (diff) | |
| download | samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.gz samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.tar.bz2 samba-f88bf54c7f6d1c2ef833047eb8327953c304b5ff.zip | |
r889: convert samba4 to use [u]int16_t instead of [u]int16
metze
(This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3)
Diffstat (limited to 'source4/include/includes.h')
| -rw-r--r-- | source4/include/includes.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index e6593754ed..a47ede6796 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -443,10 +443,12 @@ typedef int socklen_t; #endif /* - Samba needs type definitions for int16, int32_t, uint16 and uint32_t. + Samba needs type definitions for + int8_t, int16_t, int32_t, int64_t + uint8_t, uint16_t, uint32_t and uint64_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 + Normally these are signed and unsigned 8, 16, 32 and 64 bit integers, but + they actually only need to be at least 8, 16, 32 and 64 bits respectively. Thus if your word size is 8 bytes just defining them as signed and unsigned int will work. */ @@ -456,20 +458,11 @@ typedef int socklen_t; #endif #if !defined(int16) -#if (SIZEOF_SHORT == 4) -#define int16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; -#else /* SIZEOF_SHORT != 4 */ -#define int16 short -#endif /* SIZEOF_SHORT != 4 */ +#define int16 int16_t #endif - #if !defined(uint16) -#if (SIZEOF_SHORT == 4) -#define uint16 __ERROR___CANNOT_DETERMINE_TYPE_FOR_INT16; -#else /* SIZEOF_SHORT != 4 */ -#define uint16 unsigned short -#endif /* SIZEOF_SHORT != 4 */ +#define uint16 uint16_t #endif #if !defined(int32) |