diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 13:10:32 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 13:10:32 +0000 |
| commit | 58a27c732a4e9d1f412ff154a8489cf9b6904a7e (patch) | |
| tree | 45e1f69863375187647252665f3290262d61f6b1 /dmake/itypes.h | |
| parent | c9f547ff6e79cdc89ec89525dfb383c586e8db34 (diff) | |
INTEGRATION: CWS ooo20040329 (1.2.54); FILE MERGED
2004/03/19 12:41:09 waratah 1.2.54.1: #i13620# extra definitions to use internal types defined in AIX
Diffstat (limited to 'dmake/itypes.h')
| -rw-r--r-- | dmake/itypes.h | 56 |
1 files changed, 43 insertions, 13 deletions
diff --git a/dmake/itypes.h b/dmake/itypes.h index 09e75e895faa..86f7b54a5d65 100644 --- a/dmake/itypes.h +++ b/dmake/itypes.h @@ -1,4 +1,4 @@ -/* RCS $Id: itypes.h,v 1.2 2003-03-25 14:02:12 hr Exp $ +/* RCS $Id: itypes.h,v 1.3 2004-04-21 14:10:32 svesik Exp $ -- -- SYNOPSIS -- Type declarations for common types @@ -27,25 +27,55 @@ #ifndef ITYPES_h #define ITYPES_h -typedef unsigned char uint8; -typedef signed char int8; +#ifndef HAVE_INT8 + typedef unsigned char uint8; +#endif + +#ifndef HAVE_INT8 + typedef signed char int8; +#endif + #if SIZEOF_SHORT == 2 -typedef unsigned short uint16; -typedef short int16; +# ifndef HAVE_UINT16 + typedef unsigned short uint16; +# endif + +# ifndef HAVE_INT16 + typedef short int16; +# endif + #elif SIZEOF_INT == 2 -typedef unsigned int uint16; -typedef int int16; + +# ifndef HAVE_UNIT16 + typedef unsigned int uint16; +# endif + +# ifndef HAVE_INT16 + typedef int int16; +# endif #else -#error "No 2 byte type, you lose." +# ifndef HAVE_INT16 +# error "No 2 byte type, you lose." +# endif #endif #if SIZEOF_INT == 4 -typedef unsigned int uint32; -typedef int int32; +# ifndef HAVE_UINT32 + typedef unsigned int uint32; +# endif +# ifndef HAVE_INT32 + typedef int int32; +# endif #elif SIZEOF_LONG == 4 -typedef unsigned long uint32; -typedef long int32; +# ifndef HAVE_UINT32 + typedef unsigned long uint32; +# endif +# ifndef HAVE_INT32 + typedef long int32; +# endif #else -#error "No 4 byte type, you lose." +# ifndef HAVE_INT32 +# error "No 4 byte type, you lose." +# endif #endif #endif |