diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-25 13:05:43 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-25 13:05:43 +0000 |
| commit | b57fee8153ab7bb8a2fdc2a12a5ccc0c0927d6f4 (patch) | |
| tree | 74114259b652f32d411bca938e8946a654544ab3 /dmake/itypes.h | |
| parent | MWS_SRX644: migrate branch mws_srx644 -> HEAD (diff) | |
| download | core-b57fee8153ab7bb8a2fdc2a12a5ccc0c0927d6f4.tar.gz core-b57fee8153ab7bb8a2fdc2a12a5ccc0c0927d6f4.zip | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'dmake/itypes.h')
| -rw-r--r-- | dmake/itypes.h | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/dmake/itypes.h b/dmake/itypes.h index a218c9e0704b..09e75e895faa 100644 --- a/dmake/itypes.h +++ b/dmake/itypes.h @@ -1,4 +1,4 @@ -/* RCS $Id: itypes.h,v 1.1.1.1 2000-09-22 15:33:25 hr Exp $ +/* RCS $Id: itypes.h,v 1.2 2003-03-25 14:02:12 hr Exp $ -- -- SYNOPSIS -- Type declarations for common types @@ -27,20 +27,25 @@ #ifndef ITYPES_h #define ITYPES_h -#if defined(M_I86) || defined(MC68000) -typedef char int8; /* typedefs for right size ints */ -typedef int int16; -typedef long int32; -typedef unsigned char uint8; -typedef unsigned int uint16; -typedef unsigned long uint32; -#else -typedef char int8; /* typedefs for right size ints */ -typedef short int16; -typedef long int32; -typedef unsigned char uint8; +typedef unsigned char uint8; +typedef signed char int8; +#if SIZEOF_SHORT == 2 typedef unsigned short uint16; -typedef unsigned long uint32; +typedef short int16; +#elif SIZEOF_INT == 2 +typedef unsigned int uint16; +typedef int int16; +#else +#error "No 2 byte type, you lose." +#endif +#if SIZEOF_INT == 4 +typedef unsigned int uint32; +typedef int int32; +#elif SIZEOF_LONG == 4 +typedef unsigned long uint32; +typedef long int32; +#else +#error "No 4 byte type, you lose." #endif #endif |