aboutsummaryrefslogtreecommitdiff
path: root/libio
diff options
context:
space:
mode:
Diffstat (limited to 'libio')
-rw-r--r--libio/iovsprintf.c2
-rw-r--r--libio/iovsscanf.c2
-rw-r--r--libio/libioP.h6
3 files changed, 8 insertions, 2 deletions
diff --git a/libio/iovsprintf.c b/libio/iovsprintf.c
index a4fc949..fc01d82 100644
--- a/libio/iovsprintf.c
+++ b/libio/iovsprintf.c
@@ -44,7 +44,7 @@ _IO_vsprintf (string, format, args)
_IO_JUMPS ((_IO_FILE *) &sf) = &_IO_str_jumps;
_IO_str_init_static ((_IO_FILE *) &sf, string, -1, string);
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, &sf);
- _IO_flockfile (&sf);
+ _IO_flockfile ((_IO_FILE *) &sf);
ret = _IO_vfprintf ((_IO_FILE *) &sf, format, args);
_IO_putc_unlocked ('\0', (_IO_FILE *) &sf);
_IO_cleanup_region_end (1);
diff --git a/libio/iovsscanf.c b/libio/iovsscanf.c
index 6546e2d..4a21cce 100644
--- a/libio/iovsscanf.c
+++ b/libio/iovsscanf.c
@@ -39,7 +39,7 @@ DEFUN(_IO_vsscanf, (string, format, args),
_IO_JUMPS((_IO_FILE*)&sf) = &_IO_str_jumps;
_IO_str_init_static ((_IO_FILE*)&sf, (char*)string, 0, NULL);
_IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, &sf);
- _IO_flockfile (&sf);
+ _IO_flockfile ((_IO_FILE *) &sf);
ret = _IO_vfscanf((_IO_FILE*)&sf, format, args, NULL);
_IO_cleanup_region_end (1);
return ret;
diff --git a/libio/libioP.h b/libio/libioP.h
index 1f8d890..4fa3fd91 100644
--- a/libio/libioP.h
+++ b/libio/libioP.h
@@ -428,6 +428,12 @@ extern void (*_IO_cleanup_registration_needed) __P ((void));
#if _G_HAVE_MMAP
+#ifdef _LIBC
+/* When using this code in the GNU libc we must not pollute the name space. */
+#define mmap __mmap
+#define munmap __munmap
+#endif
+
#define ROUND_TO_PAGE(_S) \
(((_S) + EXEC_PAGESIZE - 1) & ~(EXEC_PAGESIZE - 1))