From 182d6096fe76b3d63b1151090cd07e60eca39302 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 29 Jul 2015 11:35:37 -0400 Subject: [PATCH] mmap64: fix undef warnings The only target that defines this is m68k, so move the existing fallback define up to avoid warnings on other systems. --- ChangeLog | 5 +++++ sysdeps/unix/sysv/linux/mmap64.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37a825ef69..a05d2625b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-08-05 Mike Frysinger + + * sysdeps/unix/sysv/linux/mmap64.c: Move MMAP2_PAGE_SHIFT define + before first use. + 2015-08-05 Mike Frysinger * nptl/allocatestack.c (allocate_stack): Move stacktop decl down to diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c index a8da641d2b..0b160b6f6b 100644 --- a/sysdeps/unix/sysv/linux/mmap64.c +++ b/sysdeps/unix/sysv/linux/mmap64.c @@ -25,12 +25,12 @@ #include /* This is always 12, even on architectures where PAGE_SHIFT != 12. */ +#ifndef MMAP2_PAGE_SHIFT +# define MMAP2_PAGE_SHIFT 12 +#endif #if MMAP2_PAGE_SHIFT == -1 static int page_shift; #else -# ifndef MMAP2_PAGE_SHIFT -# define MMAP2_PAGE_SHIFT 12 -# endif #define page_shift MMAP2_PAGE_SHIFT #endif