projects
/
musl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c7af271
)
fix type issues in stdint.h so underlying types of 64-bit types match ABI
author
Rich Felker
<dalias@aerifal.cx>
Fri, 5 Apr 2013 00:09:50 +0000
(20:09 -0400)
committer
Rich Felker
<dalias@aerifal.cx>
Fri, 5 Apr 2013 00:09:50 +0000
(20:09 -0400)
arch/arm/bits/alltypes.h.sh
patch
|
blob
|
history
arch/i386/bits/alltypes.h.sh
patch
|
blob
|
history
arch/microblaze/bits/alltypes.h.sh
patch
|
blob
|
history
arch/mips/bits/alltypes.h.sh
patch
|
blob
|
history
arch/powerpc/bits/alltypes.h.sh
patch
|
blob
|
history
arch/x86_64/bits/alltypes.h.sh
patch
|
blob
|
history
include/stdint.h
patch
|
blob
|
history
diff --git
a/arch/arm/bits/alltypes.h.sh
b/arch/arm/bits/alltypes.h.sh
index
abe782d
..
c1db1a0
100755
(executable)
--- a/
arch/arm/bits/alltypes.h.sh
+++ b/
arch/arm/bits/alltypes.h.sh
@@
-56,6
+56,9
@@
TYPEDEF uint64_t uint_fast64_t;
TYPEDEF long intptr_t;
TYPEDEF unsigned long uintptr_t;
TYPEDEF long intptr_t;
TYPEDEF unsigned long uintptr_t;
+TYPEDEF long long intmax_t;
+TYPEDEF unsigned long long uintmax_t;
+
TYPEDEF float float_t;
TYPEDEF double double_t;
TYPEDEF float float_t;
TYPEDEF double double_t;
diff --git
a/arch/i386/bits/alltypes.h.sh
b/arch/i386/bits/alltypes.h.sh
index
579aa1a
..
aec7373
100755
(executable)
--- a/
arch/i386/bits/alltypes.h.sh
+++ b/
arch/i386/bits/alltypes.h.sh
@@
-64,6
+64,9
@@
TYPEDEF uint64_t uint_fast64_t;
TYPEDEF long intptr_t;
TYPEDEF unsigned long uintptr_t;
TYPEDEF long intptr_t;
TYPEDEF unsigned long uintptr_t;
+TYPEDEF long long intmax_t;
+TYPEDEF unsigned long long uintmax_t;
+
#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 0
TYPEDEF float float_t;
TYPEDEF double double_t;
#if defined(__FLT_EVAL_METHOD__) && __FLT_EVAL_METHOD__ == 0
TYPEDEF float float_t;
TYPEDEF double double_t;
diff --git
a/arch/microblaze/bits/alltypes.h.sh
b/arch/microblaze/bits/alltypes.h.sh
index
6ddd082
..
23f12d8
100755
(executable)
--- a/
arch/microblaze/bits/alltypes.h.sh
+++ b/
arch/microblaze/bits/alltypes.h.sh
@@
-56,6
+56,9
@@
TYPEDEF uint64_t uint_fast64_t;
TYPEDEF long intptr_t;
TYPEDEF unsigned long uintptr_t;
TYPEDEF long intptr_t;
TYPEDEF unsigned long uintptr_t;
+TYPEDEF long long intmax_t;
+TYPEDEF unsigned long long uintmax_t;
+
TYPEDEF float float_t;
TYPEDEF double double_t;
TYPEDEF float float_t;
TYPEDEF double double_t;
diff --git
a/arch/mips/bits/alltypes.h.sh
b/arch/mips/bits/alltypes.h.sh
index
6ddd082
..
23f12d8
100755
(executable)
--- a/
arch/mips/bits/alltypes.h.sh
+++ b/
arch/mips/bits/alltypes.h.sh
@@
-56,6
+56,9
@@
TYPEDEF uint64_t uint_fast64_t;
TYPEDEF long intptr_t;
TYPEDEF unsigned long uintptr_t;
TYPEDEF long intptr_t;
TYPEDEF unsigned long uintptr_t;
+TYPEDEF long long intmax_t;
+TYPEDEF unsigned long long uintmax_t;
+
TYPEDEF float float_t;
TYPEDEF double double_t;
TYPEDEF float float_t;
TYPEDEF double double_t;
diff --git
a/arch/powerpc/bits/alltypes.h.sh
b/arch/powerpc/bits/alltypes.h.sh
index
417e291
..
7d3cdc3
100755
(executable)
--- a/
arch/powerpc/bits/alltypes.h.sh
+++ b/
arch/powerpc/bits/alltypes.h.sh
@@
-56,6
+56,9
@@
TYPEDEF uint64_t uint_fast64_t;
TYPEDEF int intptr_t;
TYPEDEF unsigned uintptr_t;
TYPEDEF int intptr_t;
TYPEDEF unsigned uintptr_t;
+TYPEDEF long long intmax_t;
+TYPEDEF unsigned long long uintmax_t;
+
TYPEDEF float float_t;
TYPEDEF double double_t;
TYPEDEF float float_t;
TYPEDEF double double_t;
diff --git
a/arch/x86_64/bits/alltypes.h.sh
b/arch/x86_64/bits/alltypes.h.sh
index
62e77ac
..
c5e54aa
100755
(executable)
--- a/
arch/x86_64/bits/alltypes.h.sh
+++ b/
arch/x86_64/bits/alltypes.h.sh
@@
-55,6
+55,9
@@
TYPEDEF uint64_t uint_fast64_t;
TYPEDEF long intptr_t;
TYPEDEF unsigned long uintptr_t;
TYPEDEF long intptr_t;
TYPEDEF unsigned long uintptr_t;
+TYPEDEF long intmax_t;
+TYPEDEF unsigned long uintmax_t;
+
TYPEDEF float float_t;
TYPEDEF double double_t;
TYPEDEF float float_t;
TYPEDEF double double_t;
diff --git
a/include/stdint.h
b/include/stdint.h
index
486d1ac
..
138fb21
100644
(file)
--- a/
include/stdint.h
+++ b/
include/stdint.h
@@
-24,6
+24,9
@@
#define __NEED_intptr_t
#define __NEED_uintptr_t
#define __NEED_intptr_t
#define __NEED_uintptr_t
+#define __NEED_intmax_t
+#define __NEED_uintmax_t
+
#include <bits/alltypes.h>
typedef int8_t int_least8_t;
#include <bits/alltypes.h>
typedef int8_t int_least8_t;
@@
-36,25
+39,22
@@
typedef uint16_t uint_least16_t;
typedef uint32_t uint_least32_t;
typedef uint64_t uint_least64_t;
typedef uint32_t uint_least32_t;
typedef uint64_t uint_least64_t;
-typedef long long intmax_t;
-typedef unsigned long long uintmax_t;
-
#if !defined __cplusplus || defined __STDC_LIMIT_MACROS
#define INT8_MIN (-1-0x7f)
#define INT16_MIN (-1-0x7fff)
#define INT32_MIN (-1-0x7fffffff)
#if !defined __cplusplus || defined __STDC_LIMIT_MACROS
#define INT8_MIN (-1-0x7f)
#define INT16_MIN (-1-0x7fff)
#define INT32_MIN (-1-0x7fffffff)
-#define INT64_MIN (-1-0x7fffffffffffffff
LL
)
+#define INT64_MIN (-1-0x7fffffffffffffff)
#define INT8_MAX (0x7f)
#define INT16_MAX (0x7fff)
#define INT32_MAX (0x7fffffff)
#define INT8_MAX (0x7f)
#define INT16_MAX (0x7fff)
#define INT32_MAX (0x7fffffff)
-#define INT64_MAX (0x7fffffffffffffff
LL
)
+#define INT64_MAX (0x7fffffffffffffff)
#define UINT8_MAX (0xff)
#define UINT16_MAX (0xffff)
#define UINT32_MAX (0xffffffff)
#define UINT8_MAX (0xff)
#define UINT16_MAX (0xffff)
#define UINT32_MAX (0xffffffff)
-#define UINT64_MAX (0xffffffffffffffff
ULL
)
+#define UINT64_MAX (0xffffffffffffffff)
#define INT_LEAST8_MIN INT8_MIN
#define INT_LEAST16_MIN INT16_MIN
#define INT_LEAST8_MIN INT8_MIN
#define INT_LEAST16_MIN INT16_MIN
@@
-95,15
+95,22
@@
typedef unsigned long long uintmax_t;
#define INT8_C(c) c
#define INT16_C(c) c
#define INT32_C(c) c
#define INT8_C(c) c
#define INT16_C(c) c
#define INT32_C(c) c
-#define INT64_C(c) c ## LL
#define UINT8_C(c) c
#define UINT16_C(c) c
#define UINT32_C(c) c ## U
#define UINT8_C(c) c
#define UINT16_C(c) c
#define UINT32_C(c) c ## U
-#define UINT64_C(c) c ## ULL
+#if UINTPTR_MAX == UINT64_MAX
+#define INT64_C(c) c ## L
+#define UINT64_C(c) c ## UL
+#define INTMAX_C(c) c ## L
+#define UINTMAX_C(c) c ## UL
+#else
+#define INT64_C(c) c ## LL
+#define UINT64_C(c) c ## ULL
#define INTMAX_C(c) c ## LL
#define UINTMAX_C(c) c ## ULL
#define INTMAX_C(c) c ## LL
#define UINTMAX_C(c) c ## ULL
+#endif
#endif
#endif