diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2005-12-16 19:03:12 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2005-12-16 19:03:12 +0000 |
| commit | 843e635aaa02f16f314688ba5dd8a5edc3929095 (patch) | |
| tree | 0013fed0395e7ea9a0d33acb424fd5d1d32ee0c7 | |
| parent | fd01d14ab1258e2601a94dc3734fa7505942391d (diff) | |
| download | newlib-843e635aaa02f16f314688ba5dd8a5edc3929095.zip newlib-843e635aaa02f16f314688ba5dd8a5edc3929095.tar.gz newlib-843e635aaa02f16f314688ba5dd8a5edc3929095.tar.bz2 | |
2005-12-16 Ralf Corsepius <ralf.corsepius@rtems.org>
* libc/include/stdint.h: Prefer long over int for int32_t.
Use __have_long32 to set up int32_t.
* libc/include/inttypes.h: Use "#if xxx" instead of "#ifdef xxx"
(Sync with stdint.h).
| -rw-r--r-- | newlib/ChangeLog | 7 | ||||
| -rw-r--r-- | newlib/libc/include/inttypes.h | 14 | ||||
| -rw-r--r-- | newlib/libc/include/stdint.h | 10 |
3 files changed, 19 insertions, 12 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 65d8dd7..31da6a5 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,10 @@ +2005-12-16 Ralf Corsepius <ralf.corsepius@rtems.org> + + * libc/include/stdint.h: Prefer long over int for int32_t. + Use __have_long32 to set up int32_t. + * libc/include/inttypes.h: Use "#if xxx" instead of "#ifdef xxx" + (Sync with stdint.h). + 2005-12-14 Corinna Vinschen <corinna@vinschen.de> * libc/include/sys/fcntl.h: Define O_SYNC unconditionally. Fix diff --git a/newlib/libc/include/inttypes.h b/newlib/libc/include/inttypes.h index 16e6348..0bcbd31 100644 --- a/newlib/libc/include/inttypes.h +++ b/newlib/libc/include/inttypes.h @@ -112,7 +112,7 @@ #define SCNxFAST16 __SCN16(x) /* 32-bit types */ -#if defined(__have_long32) +#if __have_long32 #define __PRI32(x) __STRINGIFY(l##x) #define __SCN32(x) __STRINGIFY(l##x) #else @@ -163,10 +163,10 @@ /* 64-bit types */ -#if defined(__have_longlong64) +#if __have_longlong64 #define __PRI64(x) __STRINGIFY(ll##x) #define __SCN64(x) __STRINGIFY(ll##x) -#elif defined(__have_long64) +#elif __have_long64 #define __PRI64(x) __STRINGIFY(l##x) #define __SCN64(x) __STRINGIFY(l##x) #else @@ -217,10 +217,10 @@ #endif /* max-bit types */ -#if defined(__have_longlong64) +#if __have_longlong64 #define __PRIMAX(x) __STRINGIFY(ll##x) #define __SCNMAX(x) __STRINGIFY(ll##x) -#elif defined(__have_long64) +#elif __have_long64 #define __PRIMAX(x) __STRINGIFY(l##x) #define __SCNMAX(x) __STRINGIFY(l##x) #else @@ -242,10 +242,10 @@ #define SCNxMAX __SCNMAX(x) /* ptr types */ -#if defined(__have_longlong64) +#if __have_longlong64 #define __PRIPTR(x) __STRINGIFY(ll##x) #define __SCNPTR(x) __STRINGIFY(ll##x) -#elif defined(__have_long64) +#elif __have_long64 #define __PRIPTR(x) __STRINGIFY(l##x) #define __SCNPTR(x) __STRINGIFY(l##x) #else diff --git a/newlib/libc/include/stdint.h b/newlib/libc/include/stdint.h index 0c8f23a..328b094 100644 --- a/newlib/libc/include/stdint.h +++ b/newlib/libc/include/stdint.h @@ -79,14 +79,14 @@ typedef uint16_t uint_least8_t; #endif #endif -#if __STDINT_EXP(INT_MAX) == 0x7fffffffL -typedef signed int int32_t; -typedef unsigned int uint32_t; -#define __int32_t_defined 1 -#elif __STDINT_EXP(LONG_MAX) == 0x7fffffffL +#if __have_long32 typedef signed long int32_t; typedef unsigned long uint32_t; #define __int32_t_defined 1 +#elif __STDINT_EXP(INT_MAX) == 0x7fffffffL +typedef signed int int32_t; +typedef unsigned int uint32_t; +#define __int32_t_defined 1 #elif __STDINT_EXP(SHRT_MAX) == 0x7fffffffL typedef signed short int32_t; typedef unsigned short uint32_t; |