diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-07-27 10:41:30 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-07-30 09:51:36 +0100 |
| commit | 0d6f330878173c7ba45b884f3e41ce40b917c73c (patch) | |
| tree | 0a887066d35d8b01914330d6ab6818fe015a5a9d /com32/include/bitsize32 | |
| parent | 0fcd9a48603497dcc2727570a50a4401bb0fd085 (diff) | |
| parent | f0bbf9dd40f37f8c4870a33784996efd56955a75 (diff) | |
| download | syslinux-0d6f330878173c7ba45b884f3e41ce40b917c73c.tar.gz | |
Merge remote-tracking branch 'mfleming/elflink' into for-hpa/elflink/firmware
Conflicts:
Makefile
com32/elflink/ldlinux/adv.c
com32/elflink/ldlinux/kernel.c
com32/elflink/ldlinux/ldlinux.c
com32/include/bitsize/stddef.h
com32/include/bitsize/stdint.h
com32/include/stdint.h
com32/include/sys/module.h
com32/include/sys/x86_64/bitops.h
com32/include/syslinux/linux.h
com32/lib/Makefile
com32/lib/sys/ansicon_write.c
com32/lib/sys/module/elfutils.h
com32/lib/sys/vesa/efi/fill.h
com32/lib/syslinux/load_linux.c
com32/lib/syslinux/serial.c
com32/lib/syslinux/shuffle.c
core/conio.c
core/elflink/config.c
core/elflink/load_env32.c
core/graphics.c
core/include/graphics.h
core/init.c
core/pxelinux.asm
mk/elf.mk
mk/lib.mk
Diffstat (limited to 'com32/include/bitsize32')
| -rw-r--r-- | com32/include/bitsize32/limits.h | 4 | ||||
| -rw-r--r-- | com32/include/bitsize32/stddef.h | 6 | ||||
| -rw-r--r-- | com32/include/bitsize32/stdint.h | 17 |
3 files changed, 3 insertions, 24 deletions
diff --git a/com32/include/bitsize32/limits.h b/com32/include/bitsize32/limits.h index 8eb97d6d..f19205fe 100644 --- a/com32/include/bitsize32/limits.h +++ b/com32/include/bitsize32/limits.h @@ -2,8 +2,8 @@ * bits32/limits.h */ -#ifndef _BITSIZE_LIMITS_H -#define _BITSIZE_LIMITS_H +#ifndef _BITSIZE32_LIMITS_H +#define _BITSIZE32_LIMITS_H #define LONG_BIT 32 diff --git a/com32/include/bitsize32/stddef.h b/com32/include/bitsize32/stddef.h index e5d49376..c34c675c 100644 --- a/com32/include/bitsize32/stddef.h +++ b/com32/include/bitsize32/stddef.h @@ -3,11 +3,7 @@ */ #define _SIZE_T -#if defined(__s390__) || defined(__hppa__) || defined(__cris__) -typedef unsigned long size_t; -#else typedef unsigned int size_t; -#endif #define _PTRDIFF_T -typedef signed int ptrdiff_t; +typedef signed long ptrdiff_t; diff --git a/com32/include/bitsize32/stdint.h b/com32/include/bitsize32/stdint.h index c886a4c2..bdc69705 100644 --- a/com32/include/bitsize32/stdint.h +++ b/com32/include/bitsize32/stdint.h @@ -3,15 +3,8 @@ */ -/* -typedef signed char int8_t; -typedef short int int16_t; -typedef int int32_t; typedef long long int int64_t; -typedef unsigned char uint8_t; -typedef unsigned short int uint16_t; -typedef unsigned int uint32_t; typedef unsigned long long int uint64_t; typedef int int_fast16_t; @@ -29,13 +22,3 @@ typedef unsigned int uintptr_t; #define __PRI64_RANK "ll" #define __PRIFAST_RANK "" #define __PRIPTR_RANK "" -*/ - -/* changes made according compiler output */ -typedef signed int int_fast16_t; /* was short */ -typedef signed int int_fast32_t; -typedef unsigned int uint_fast16_t; /* was ushort */ -/* Pointer types */ - -typedef int32_t intptr_t; -typedef uint32_t uintptr_t; |