summaryrefslogtreecommitdiff
path: root/sysdeps/unix/sysv/linux/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/unix/sysv/linux/sys')
-rw-r--r--sysdeps/unix/sysv/linux/sys/kd.h4
-rw-r--r--sysdeps/unix/sysv/linux/sys/mman.h10
2 files changed, 9 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/kd.h b/sysdeps/unix/sysv/linux/sys/kd.h
index 0ff5220014..b37586abfd 100644
--- a/sysdeps/unix/sysv/linux/sys/kd.h
+++ b/sysdeps/unix/sysv/linux/sys/kd.h
@@ -20,7 +20,9 @@
#define _SYS_KD_H 1
/* Make sure the <linux/types.h> header is not loaded. */
-#define _LINUX_TYPES_H 1
+#ifndef _LINUX_TYPES_H
+# define _LINUX_TYPES_H 1
+#endif
#include <linux/kd.h>
diff --git a/sysdeps/unix/sysv/linux/sys/mman.h b/sysdeps/unix/sysv/linux/sys/mman.h
index e2434f135f..70f95d080f 100644
--- a/sysdeps/unix/sysv/linux/sys/mman.h
+++ b/sysdeps/unix/sysv/linux/sys/mman.h
@@ -42,18 +42,20 @@ __BEGIN_DECLS
deallocates any previous mapping for the affected region. */
extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot,
- int __flags, int __fd, __off_t __offset));
+ int __flags, int __fd, __off_t __offset));
#ifndef __USE_FILE_OFFSET64
extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
- int __flags, int __fd, __off_t __offset));
+ int __flags, int __fd, __off_t __offset));
#else
extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
- int __flags, int __fd, __off_t __offset))
+ int __flags, int __fd, __off64_t __offset))
__asm__ ("mmap64");
#endif
#ifdef __USE_LARGEFILE64
+extern __ptr_t __mmap64 __P ((__ptr_t __addr, size_t __len, int __prot,
+ int __flags, int __fd, __off64_t __offset));
extern __ptr_t mmap64 __P ((__ptr_t __addr, size_t __len, int __prot,
- int __flags, int __fd, __off64_t __offset));
+ int __flags, int __fd, __off64_t __offset));
#endif
/* Deallocate any mapping for the region starting at ADDR and extending LEN