diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-10-15 05:34:02 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-10-15 05:34:02 +0000 |
commit | f2ea0f5b0d6ff2bbf261a5fd3d61f967e36f22e6 (patch) | |
tree | 9553a1d3102f18a5c73538902c851b463b70c108 /sysdeps/unix/sysv/linux/sys/mman.h | |
parent | 1ea89a402d892b68b193e2e4390d8eb33ed686e7 (diff) | |
download | glibc-f2ea0f5b0d6ff2bbf261a5fd3d61f967e36f22e6.tar.gz glibc-f2ea0f5b0d6ff2bbf261a5fd3d61f967e36f22e6.tar.xz glibc-f2ea0f5b0d6ff2bbf261a5fd3d61f967e36f22e6.zip |
Update. cvs/libc-ud-971014
1997-10-15 06:56 Ulrich Drepper <drepper@cygnus.com> * Rules: Remove ruls to magically install <subdir>.h headers. Reported by Mark Kettenis <kettenis@phys.uva.nl>. * glibcbug.in: Fix @gnu.ai.mit.edu -> @gnu.org. * version.c: Likewise. * catgets/gencat.c: Likewise. * db2/makedb.c: Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * libc.map: Move _IO_list_all back to GLIBC_2.0. * elf/rtld.c: Provide name of running program to _dl_new_object. * Rules: Implement shared-only-sources. * include/libc-symbols.h: Define default_symbol_version. * libio/Makefile (shared-only-sources): Define. * libio/freopen.c: Define as default version. * libio/iofopen.c: Likewise. * libio/genops.c: Define _IO_list_all here. * libio/stdfiles.c: Create linked list with public names. * libio/oldstdfiles.c: Likewise. * stdio-common/printf.c: Optimize. * stdio-common/scanf.c: Optimize. * sysdeps/generic/setfpucw.c: Include #include <...> not "...". * sysdeps/i386/i486/bits/string.h: Add optimized versions of index and rindex. 1997-10-14 Andreas Jaeger <aj@arthur.rhein-neckar.de> * manual/arith.texi: Spelling fixes. * manual/conf.texi: Likewise. * manual/creature.texi: Likewise. * manual/filesys.texi: Likewise. * manual/intro.texi: Likewise. * manual/llio.texi: Likewise. * manual/math.texi: Likewise. * manual/message.texi: Likewise. * manual/pattern.texi: Likewise. * manual/search.texi: Likewise. * manual/signal.texi: Likewise. * manual/socket.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/string.texi: Likewise. * manual/time.texi: Likewise. * manual/users.texi: Likewise. 1997-10-13 05:25 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/sys/mman.h: Use __ptr_t instead of __caddr_t. * sysdeps/unix/bsd/osf/sys/mman.h: Likewise. * sysdeps/unix/bsd/sun/sunos4/sys/mman.h: Likewise. * sysdeps/unix/bsd/ultrix4/sys/mman.h: Likewise. * sysdeps/unix/sysv/irix4/sys/mman.h: Likewise. * sysdeps/unix/sysv/linux/sys/mman.h: Likewise. * sysdeps/mach/hurd/mmap.c: Likewise. * sysdeps/generic/mmap.c: Likewise. * sysdeps/unix/bsd/sun/sunos4/mmap.c: Likewise. * sysdeps/mach/munmap.c: Likewise. * sysdeps/generic/munmap.c: Likewise. * sysdeps/mach/mprotect.c: Likewise. * sysdeps/generic/mprotect.c: Likewise. * sysdeps/generic/msync.c: Likewise. * sysdeps/generic/madvise.c: Likewise. * sysdeps/unix/sysv/linux/madvise.c: Include stub version from generic subdir. 1997-10-12 20:27 Zack Weinberg <zack@rabi.phys.columbia.edu> * sysdeps/stub (all files): Moved to sysdeps/generic. * all files using stub_warning: Include <stub-tag.h>. * include/stub-tag.h: New file, marks stubs in .d files. * Makerules: Look for stub-tag.h, not sysdeps/stub, when building <gnu/stubs.h>. * configure.in: Don't add sysdeps/stub to $sysnames. * sysdeps/unix/Makefile: Look for generic headers, not stub headers. * sysdeps/generic/Makefile: Likewise. * manual/maint.texi: Delete references to sysdeps/stub. * INSTALL: Rebuilt. * configure: Rebuilt.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sys/mman.h')
-rw-r--r-- | sysdeps/unix/sysv/linux/sys/mman.h | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/sysdeps/unix/sysv/linux/sys/mman.h b/sysdeps/unix/sysv/linux/sys/mman.h index 129702e33c..ea326e2cd9 100644 --- a/sysdeps/unix/sysv/linux/sys/mman.h +++ b/sysdeps/unix/sysv/linux/sys/mman.h @@ -30,7 +30,7 @@ #include <bits/mman.h> /* Return value of `mmap' in case of an error. */ -#define MAP_FAILED ((__caddr_t) -1) +#define MAP_FAILED ((__ptr_t) -1) __BEGIN_DECLS /* Map addresses starting near ADDR and extending for LEN bytes. from @@ -42,41 +42,41 @@ __BEGIN_DECLS for errors (in which case `errno' is set). A successful `mmap' call deallocates any previous mapping for the affected region. */ -extern __caddr_t __mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)); +extern __ptr_t __mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset)); #ifndef __USE_FILE_OFFSET64 -extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)); +extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset)); #else -extern __caddr_t mmap __P ((__caddr_t __addr, size_t __len, int __prot, - int __flags, int __fd, __off_t __offset)) +extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot, + int __flags, int __fd, __off_t __offset)) __asm__ ("mmap64"); #endif #ifdef __USE_LARGEFILE64 -extern __caddr_t mmap64 __P ((__caddr_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)); #endif /* Deallocate any mapping for the region starting at ADDR and extending LEN bytes. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __munmap __P ((__caddr_t __addr, size_t __len)); -extern int munmap __P ((__caddr_t __addr, size_t __len)); +extern int __munmap __P ((__ptr_t __addr, size_t __len)); +extern int munmap __P ((__ptr_t __addr, size_t __len)); /* Change the memory protection of the region starting at ADDR and extending LEN bytes to PROT. Returns 0 if successful, -1 for errors (and sets errno). */ -extern int __mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); -extern int mprotect __P ((__caddr_t __addr, size_t __len, int __prot)); +extern int __mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); +extern int mprotect __P ((__ptr_t __addr, size_t __len, int __prot)); /* Synchronize the region starting at ADDR and extending LEN bytes with the file it maps. Filesystem operations on a file being mapped are unpredictable before this is done. Flags are from the MS_* set. */ -extern int msync __P ((__caddr_t __addr, size_t __len, int __flags)); +extern int msync __P ((__ptr_t __addr, size_t __len, int __flags)); #ifdef __USE_BSD /* Advise the system about particular usage patterns the program follows for the region starting at ADDR and extending LEN bytes. */ -extern int madvise __P ((__caddr_t __addr, size_t __len, int __advice)); +extern int madvise __P ((__ptr_t __addr, size_t __len, int __advice)); #endif /* Cause all currently mapped pages of the process to be memory resident @@ -90,22 +90,21 @@ extern int munlockall __P ((void)); /* Guarantee all whole pages mapped by the range [ADDR,ADDR+LEN) to be memory resident. */ -extern int mlock __P ((__caddr_t __addr, size_t __len)); +extern int mlock __P ((__ptr_t __addr, size_t __len)); /* Unlock whole pages previously mapped by the range [ADDR,ADDR+LEN). */ -extern int munlock __P ((__caddr_t __addr, size_t __len)); +extern int munlock __P ((__ptr_t __addr, size_t __len)); #ifdef __USE_MISC /* Remap pages mapped by the range [ADDR,ADDR+OLD_LEN) to new length NEW_LEN. If MAY_MOVE is MREMAP_MAYMOVE the returned address may differ from ADDR. */ -extern __caddr_t __mremap __P ((__caddr_t __addr, size_t __old_len, - size_t __new_len, int __may_move)); -extern __caddr_t mremap __P ((__caddr_t __addr, size_t __old_len, - size_t __new_len, int __may_move)); +extern __ptr_t __mremap __P ((__ptr_t __addr, size_t __old_len, + size_t __new_len, int __may_move)); +extern __ptr_t mremap __P ((__ptr_t __addr, size_t __old_len, + size_t __new_len, int __may_move)); #endif __END_DECLS - #endif /* _SYS_MMAN_H */ |