hppa: put custom madvise defines behind __USE_MISC

Message ID 1438766399-3581-1-git-send-email-vapier@gentoo.org
State Committed
Delegated to: Mike Frysinger
Headers

Commit Message

Mike Frysinger Aug. 5, 2015, 9:19 a.m. UTC
  No other arch exports these defines, and having them in the default
namespace causes conformance header tests to fail.  Put them behind
the __USE_MISC define as that is what other arches seem to use.

2015-08-05  Mike Frysinger  <vapier@gentoo.org>

	* sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_MISC]: Move all
	MADV_*_PAGES defines behind this feature check.
---
 sysdeps/unix/sysv/linux/hppa/bits/mman.h | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)
  

Comments

Mike Frysinger Aug. 9, 2015, 3:47 a.m. UTC | #1
On 05 Aug 2015 05:19, Mike Frysinger wrote:
> No other arch exports these defines, and having them in the default
> namespace causes conformance header tests to fail.  Put them behind
> the __USE_MISC define as that is what other arches seem to use.

i've pushed this now
-mike
  

Patch

diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
index e7ee5b8..cbde4b8 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
@@ -93,14 +93,17 @@ 
 #endif
 
 /* The range 12-64 is reserved for page size specification. */
-#define MADV_4K_PAGES   12              /* Use 4K pages  */
-#define MADV_16K_PAGES  14              /* Use 16K pages */
-#define MADV_64K_PAGES  16              /* Use 64K pages */
-#define MADV_256K_PAGES 18              /* Use 256K pages */
-#define MADV_1M_PAGES   20              /* Use 1 Megabyte pages */
-#define MADV_4M_PAGES   22              /* Use 4 Megabyte pages */
-#define MADV_16M_PAGES  24              /* Use 16 Megabyte pages */
-#define MADV_64M_PAGES  26              /* Use 64 Megabyte pages */
+/* These are Linux-specific.  */
+#ifdef __USE_MISC
+# define MADV_4K_PAGES		12	/* Use 4K pages.  */
+# define MADV_16K_PAGES		14	/* Use 16K pages.  */
+# define MADV_64K_PAGES		16	/* Use 64K pages.  */
+# define MADV_256K_PAGES	18	/* Use 256K pages.  */
+# define MADV_1M_PAGES		20	/* Use 1 Megabyte pages.  */
+# define MADV_4M_PAGES		22	/* Use 4 Megabyte pages.  */
+# define MADV_16M_PAGES		24	/* Use 16 Megabyte pages.  */
+# define MADV_64M_PAGES		26	/* Use 64 Megabyte pages.  */
+#endif
 
 /* The POSIX people had to invent similar names for the same things.  */
 #ifdef __USE_XOPEN2K