summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-06-25 15:38:00 -0400
committerRich Felker <dalias@aerifal.cx>2011-06-25 15:38:00 -0400
commite8b8f3c90e02d8fa077be0f273fce1e48e2719d2 (patch)
tree159dfa06dcb419c489086279d7b90deac471fac7
parent59633c736dcf6dcd11c24edab4803c85b8462bf6 (diff)
downloadmusl-e8b8f3c90e02d8fa077be0f273fce1e48e2719d2.tar.gz
move all limits that don't vary out of bits/limits.h, into main limits.h
-rw-r--r--arch/i386/bits/limits.h27
-rw-r--r--arch/x86_64/bits/limits.h28
-rw-r--r--include/limits.h22
3 files changed, 24 insertions, 53 deletions
diff --git a/arch/i386/bits/limits.h b/arch/i386/bits/limits.h
index 4e992453..e19461df 100644
--- a/arch/i386/bits/limits.h
+++ b/arch/i386/bits/limits.h
@@ -1,33 +1,8 @@
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
-#define PIPE_BUF 4096
-#define PAGESIZE 4096
-#define PAGE_SIZE PAGESIZE
-#define FILESIZEBITS 64
-#define NAME_MAX 255
-#define SYMLINK_MAX 255
-#define PATH_MAX 4096
-#define NZERO 20
-#define NGROUPS_MAX 32
-#define ARG_MAX 131072
-#define IOV_MAX 1024
-#define SYMLOOP_MAX 40
-#define WORD_BIT 32
+#define PAGE_SIZE 4096
#define LONG_BIT 32
#endif
-#define SHRT_MIN (-1-0x7fff)
-#define SHRT_MAX 0x7fff
-#define USHRT_MAX 0xffff
-
-#define INT_MIN (-1-0x7fffffff)
-#define INT_MAX 0x7fffffff
-#define UINT_MAX 0xffffffffU
-
-#define LONG_MIN (-1-0x7fffffffL)
#define LONG_MAX 0x7fffffffL
-#define ULONG_MAX 0xffffffffUL
-
-#define LLONG_MIN (-1-0x7fffffffffffffffLL)
#define LLONG_MAX 0x7fffffffffffffffLL
-#define ULLONG_MAX 0xffffffffffffffffULL
diff --git a/arch/x86_64/bits/limits.h b/arch/x86_64/bits/limits.h
index 46544898..2ba566bf 100644
--- a/arch/x86_64/bits/limits.h
+++ b/arch/x86_64/bits/limits.h
@@ -1,34 +1,8 @@
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
-#define PIPE_BUF 4096
-#define PAGESIZE 4096
-#define PAGE_SIZE PAGESIZE
-#define FILESIZEBITS 64
-#define NAME_MAX 255
-#define SYMLINK_MAX 255
-#define PATH_MAX 4096
-#define NZERO 20
-#define NGROUPS_MAX 32
-#define ARG_MAX 131072
-#define IOV_MAX 1024
-#define SYMLOOP_MAX 40
-#define WORD_BIT 64
+#define PAGE_SIZE 4096
#define LONG_BIT 64
#endif
-#define SHRT_MIN (-1-0x7fff)
-#define SHRT_MAX 0x7fff
-#define USHRT_MAX 0xffff
-
-#define INT_MIN (-1-0x7fffffff)
-#define INT_MAX 0x7fffffff
-#define UINT_MAX 0xffffffffU
-
-#define LONG_MIN (-1-0x7fffffffffffffffL)
#define LONG_MAX 0x7fffffffffffffffL
-#define ULONG_MAX 0xffffffffffffffffUL
-
-#define LLONG_MIN (-1-0x7fffffffffffffffLL)
#define LLONG_MAX 0x7fffffffffffffffLL
-#define ULLONG_MAX 0xffffffffffffffffULL
-
diff --git a/include/limits.h b/include/limits.h
index 4d0410a0..56f7a12f 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -13,12 +13,34 @@
#define UCHAR_MAX 255
#define CHAR_MIN (-128)
#define CHAR_MAX 127
+#define SHRT_MIN (-1-0x7fff)
+#define SHRT_MAX 0x7fff
+#define USHRT_MAX 0xffff
+#define INT_MIN (-1-0x7fffffff)
+#define INT_MAX 0x7fffffff
+#define UINT_MAX 0xffffffffU
+#define LONG_MIN (-LONG_MAX-1)
+#define ULONG_MAX (2UL*LONG_MAX+1)
+#define LLONG_MIN (-LLONG_MAX-1)
+#define ULLONG_MAX (2ULL*LLONG_MAX+1)
#define MB_LEN_MAX 4
#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
|| defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE)
+#define PIPE_BUF 4096
+#define PAGESIZE PAGE_SIZE
+#define FILESIZEBITS 64
+#define NAME_MAX 255
+#define SYMLINK_MAX 255
+#define PATH_MAX 4096
+#define NZERO 20
+#define NGROUPS_MAX 32
+#define ARG_MAX 131072
+#define IOV_MAX 1024
+#define SYMLOOP_MAX 40
+#define WORD_BIT 32
#define SSIZE_MAX LONG_MAX
#define TZNAME_MAX 6
#define TTY_NAME_MAX 20