aboutsummaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2019-10-17 19:19:40 -0400
committerRich Felker <dalias@aerifal.cx>2019-10-17 19:23:39 -0400
commit7cc79d10afd43811a486fd5e9fcdf8e45ac599e0 (patch)
tree740e26e12e169f5d2fb1812e65e728593f94f1fe /arch/i386
parent316730cdc7a330cddf288b4e5c1de5daa64e19f4 (diff)
downloadmusl-7cc79d10afd43811a486fd5e9fcdf8e45ac599e0.tar.gz
musl-7cc79d10afd43811a486fd5e9fcdf8e45ac599e0.tar.xz
musl-7cc79d10afd43811a486fd5e9fcdf8e45ac599e0.zip
define LONG_MAX via arch alltypes.h, strip down bits/limits.h
LLONG_MAX is uniform for all archs we support and plenty of header and code level logic assumes it is, so it does not make sense for limits.h bits mechanism to pretend it's variable. LONG_BIT can be defined in terms of LONG_MAX; there's no reason to put it in bits. by moving LONG_MAX definition to __LONG_MAX in alltypes.h and moving LLONG_MAX out of bits, there are now no plain-C limits that are defined in the bits header, so the bits header only needs to be included in the POSIX or extended profiles. this allows the feature test macro logic to be removed from the bits header, facilitating a long-term goal of getting such logic out of bits. having __LONG_MAX in alltypes.h will allow further generalization of headers. archs without a constant PAGESIZE no longer need bits/limits.h at all.
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/bits/alltypes.h.in1
-rw-r--r--arch/i386/bits/limits.h7
2 files changed, 1 insertions, 7 deletions
diff --git a/arch/i386/bits/alltypes.h.in b/arch/i386/bits/alltypes.h.in
index 95491e4b..6f634009 100644
--- a/arch/i386/bits/alltypes.h.in
+++ b/arch/i386/bits/alltypes.h.in
@@ -3,6 +3,7 @@
#define _Reg int
#define __BYTE_ORDER 1234
+#define __LONG_MAX 0x7fffffffL
#ifndef __cplusplus
#ifdef __WCHAR_TYPE__
diff --git a/arch/i386/bits/limits.h b/arch/i386/bits/limits.h
index c340ceb2..07743b6f 100644
--- a/arch/i386/bits/limits.h
+++ b/arch/i386/bits/limits.h
@@ -1,8 +1 @@
-#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
- || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
#define PAGESIZE 4096
-#define LONG_BIT 32
-#endif
-
-#define LONG_MAX 0x7fffffffL
-#define LLONG_MAX 0x7fffffffffffffffLL