diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2013-05-09 14:33:14 -0700 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-05-10 17:31:31 +0200 |
| commit | c5e036a04368186fe73925c6fb101c594513391c (patch) | |
| tree | f119ab1d2a1da63d55474e36a0ebf05a7a2ed613 /src/device/oprom/include | |
| parent | b8b3e8bff32ee7dddcacec11e015f6683783eb2f (diff) | |
Get rid of a number of __GNUC__ checks
In the process of streamlining coreboot code and getting
rid of unneeded ifdefs, drop a number of unneeded checks
for the GNU C compiler. This also cleans up x86emu/types.h
significantly by dropping all the duplicate types in there.
Change-Id: I0bf289e149ed02e5170751c101adc335b849a410
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/3226
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/device/oprom/include')
| -rw-r--r-- | src/device/oprom/include/x86emu/types.h | 47 |
1 files changed, 3 insertions, 44 deletions
diff --git a/src/device/oprom/include/x86emu/types.h b/src/device/oprom/include/x86emu/types.h index 5485eeaedf..bb6dab44ac 100644 --- a/src/device/oprom/include/x86emu/types.h +++ b/src/device/oprom/include/x86emu/types.h @@ -36,54 +36,13 @@ * ****************************************************************************/ -/* $XFree86: xc/extras/x86emu/include/x86emu/types.h,v 1.4 2000/09/26 15:56:44 tsi Exp $ */ - #ifndef __X86EMU_TYPES_H #define __X86EMU_TYPES_H -//#ifndef IN_MODULE -//#include <sys/types.h> -//#endif - -/* - * The following kludge is an attempt to work around typedef conflicts with - * <sys/types.h>. - */ -#define u8 x86emuu8 -#define u16 x86emuu16 -#define u32 x86emuu32 -#define u64 x86emuu64 -#define s8 x86emus8 -#define s16 x86emus16 -#define s32 x86emus32 -#define s64 x86emus64 -#define uint x86emuuint -#define sint x86emusint - -/*---------------------- Macros and type definitions ----------------------*/ - -/* Currently only for Linux/32bit */ -#if defined(__GNUC__) && !defined(NO_LONG_LONG) -#define __HAS_LONG_LONG__ -#endif - -typedef unsigned char u8; -typedef unsigned short u16; -typedef unsigned int u32; -#ifdef __HAS_LONG_LONG__ -typedef unsigned long long u64; -#endif - -typedef signed char s8; -typedef signed short s16; -typedef signed int s32; -#ifdef __HAS_LONG_LONG__ -typedef signed long long s64; -#endif - -typedef unsigned int uint; -typedef signed int sint; +#include <stdint.h> +typedef unsigned int uint; +typedef signed int sint; typedef u16 X86EMU_pioAddr; #endif /* __X86EMU_TYPES_H */ |