From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 11 Apr 2011 14:48:52 +0000 (-0400)
Subject: more types cleanup
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=43b2e9bf26371e096b69f4753ff9f6dbec437f5e

more types cleanup

the basic idea is that the only things in alltypes.h should be types
that either vary from system to system (in practice, not just in
theoretical la-la land - this is the implementation so we choose what
constraints we want to impose on ports) or which are needed by
multiple system headers.
---

diff --git a/arch/i386/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh
index 4daaf98f..9d94c911 100755
--- a/arch/i386/bits/alltypes.h.sh
+++ b/arch/i386/bits/alltypes.h.sh
@@ -53,9 +53,6 @@ TYPEDEF uint64_t           uint_fast64_t;
 TYPEDEF long          intptr_t;
 TYPEDEF unsigned long uintptr_t;
 
-TYPEDEF long long          intmax_t;
-TYPEDEF unsigned long long uintmax_t;
-
 TYPEDEF long time_t;
 TYPEDEF int suseconds_t;
 STRUCT timeval { time_t tv_sec; int tv_usec; };
diff --git a/arch/x86_64/bits/alltypes.h.sh b/arch/x86_64/bits/alltypes.h.sh
index bcbb5ee1..af2a4d9a 100755
--- a/arch/x86_64/bits/alltypes.h.sh
+++ b/arch/x86_64/bits/alltypes.h.sh
@@ -53,9 +53,6 @@ TYPEDEF uint64_t           uint_fast64_t;
 TYPEDEF long          intptr_t;
 TYPEDEF unsigned long uintptr_t;
 
-TYPEDEF long long          intmax_t;
-TYPEDEF unsigned long long uintmax_t;
-
 TYPEDEF long time_t;
 TYPEDEF long suseconds_t;
 STRUCT timeval { time_t tv_sec; int tv_usec; };
diff --git a/include/stdint.h b/include/stdint.h
index 8e187a5f..a4c73b5e 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -11,16 +11,6 @@
 #define __NEED_uint32_t
 #define __NEED_uint64_t
 
-#define __NEED_int_least8_t
-#define __NEED_int_least16_t
-#define __NEED_int_least32_t
-#define __NEED_int_least64_t
-
-#define __NEED_uint_least8_t
-#define __NEED_uint_least16_t
-#define __NEED_uint_least32_t
-#define __NEED_uint_least64_t
-
 #define __NEED_int_fast8_t
 #define __NEED_int_fast16_t
 #define __NEED_int_fast32_t
@@ -33,8 +23,6 @@
 
 #define __NEED_intptr_t
 #define __NEED_uintptr_t
-#define __NEED_intmax_t
-#define __NEED_uintmax_t
 
 #include <bits/alltypes.h>
 
@@ -48,6 +36,9 @@ typedef uint16_t uint_least16_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)