aboutsummaryrefslogtreecommitdiff
path: root/newlib
diff options
context:
space:
mode:
authorJeff Johnston <jjohnstn@redhat.com>2006-07-31 22:21:24 +0000
committerJeff Johnston <jjohnstn@redhat.com>2006-07-31 22:21:24 +0000
commitcc023a755710e51e4b25d139bcb279fefef34860 (patch)
tree52f2871bc1f972c02d4e38e0c84b0081f95849c1 /newlib
parentb23bc8c33cfd5ca607bcc07deaee616f9dceff35 (diff)
downloadnewlib-cc023a755710e51e4b25d139bcb279fefef34860.zip
newlib-cc023a755710e51e4b25d139bcb279fefef34860.tar.gz
newlib-cc023a755710e51e4b25d139bcb279fefef34860.tar.bz2
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.
Diffstat (limited to 'newlib')
-rw-r--r--newlib/ChangeLog5
-rw-r--r--newlib/libc/sys/linux/mmap.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index f177d70..1e6434a 100644
--- 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
--- 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);