2006-07-31 Jeff Johnston <jjohnstn@redhat.com>

        * libc/sys/linux/mmap.c: Remove include of sys/mman.h
        to avoid conflict with newer glibc's revision of mremap.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f177d70..1e6434a 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-31  Jeff Johnston  <jjohnstn@redhat.com>       
+
+       * libc/sys/linux/mmap.c: Remove include of sys/mman.h
+       to avoid conflict with newer glibc's revision of mremap.
+
 2006-07-05  Jeff Johnston  <jjohnstn@redhat.com>       
 
        * libc/stdlib/mprec.h [_DOUBLE_IS_32BITS]: Turn off C99 hex 

diff --git a/newlib/libc/sys/linux/mmap.c b/newlib/libc/sys/linux/mmap.c
index 6af2b85..f4a8f23 100644 (file)
--- a/newlib/libc/sys/linux/mmap.c
+++ b/newlib/libc/sys/linux/mmap.c
@@ -2,7 +2,6 @@
 
 /* Copyright 2002, Red Hat Inc. */
 
-#include <sys/mman.h>
 #include <machine/syscall.h>
 
 _syscall6(void *,mmap,void *,addr,size_t,len,int,prot,int,flags,int,fd,off_t,off);