From: Rich Felker <dalias@aerifal.cx>
Date: Sat, 10 Mar 2018 22:47:14 +0000 (-0500)
Subject: reverse definition dependency between PAGESIZE and PAGE_SIZE
X-Git-Tag: v1.1.20~141
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c9c2cd3e6955cb1d57b8be01d4b072bf44058762;p=oweals%2Fmusl.git

reverse definition dependency between PAGESIZE and PAGE_SIZE

PAGESIZE is actually the version defined in POSIX base, with PAGE_SIZE
being in the XSI option. use PAGESIZE as the underlying definition to
facilitate making exposure of PAGE_SIZE conditional.
---

diff --git a/arch/i386/bits/limits.h b/arch/i386/bits/limits.h
index 65a3dd64..c340ceb2 100644
--- a/arch/i386/bits/limits.h
+++ b/arch/i386/bits/limits.h
@@ -1,6 +1,6 @@
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 4096
+#define PAGESIZE 4096
 #define LONG_BIT 32
 #endif
 
diff --git a/arch/or1k/bits/limits.h b/arch/or1k/bits/limits.h
index 483b6749..3a811c99 100644
--- a/arch/or1k/bits/limits.h
+++ b/arch/or1k/bits/limits.h
@@ -1,6 +1,6 @@
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 8192
+#define PAGESIZE 8192
 #define LONG_BIT 32
 #endif
 
diff --git a/arch/s390x/bits/limits.h b/arch/s390x/bits/limits.h
index 792a30b9..86ef7663 100644
--- a/arch/s390x/bits/limits.h
+++ b/arch/s390x/bits/limits.h
@@ -1,6 +1,6 @@
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 4096
+#define PAGESIZE 4096
 #define LONG_BIT 64
 #endif
 
diff --git a/arch/sh/bits/limits.h b/arch/sh/bits/limits.h
index 65a3dd64..c340ceb2 100644
--- a/arch/sh/bits/limits.h
+++ b/arch/sh/bits/limits.h
@@ -1,6 +1,6 @@
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 4096
+#define PAGESIZE 4096
 #define LONG_BIT 32
 #endif
 
diff --git a/arch/x32/bits/limits.h b/arch/x32/bits/limits.h
index 65a3dd64..c340ceb2 100644
--- a/arch/x32/bits/limits.h
+++ b/arch/x32/bits/limits.h
@@ -1,6 +1,6 @@
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 4096
+#define PAGESIZE 4096
 #define LONG_BIT 32
 #endif
 
diff --git a/arch/x86_64/bits/limits.h b/arch/x86_64/bits/limits.h
index 792a30b9..86ef7663 100644
--- a/arch/x86_64/bits/limits.h
+++ b/arch/x86_64/bits/limits.h
@@ -1,6 +1,6 @@
 #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \
  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
-#define PAGE_SIZE 4096
+#define PAGESIZE 4096
 #define LONG_BIT 64
 #endif
 
diff --git a/include/limits.h b/include/limits.h
index f9805a1e..3e476093 100644
--- a/include/limits.h
+++ b/include/limits.h
@@ -40,8 +40,8 @@
  || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
 
 #define PIPE_BUF 4096
-#ifdef PAGE_SIZE
-#define PAGESIZE PAGE_SIZE
+#ifdef PAGESIZE
+#define PAGE_SIZE PAGESIZE
 #endif
 #define FILESIZEBITS 64
 #define NAME_MAX 255