Use __ptr_t instead of __caddr_t.

This commit is contained in:
Ulrich Drepper 1997-10-15 05:31:59 +00:00
parent a893b08668
commit 7b5e4b7fe2
5 changed files with 48 additions and 48 deletions

View File

@ -77,7 +77,7 @@
#define MS_INVALIDATE 4 /* Invalidate cached pages. */
/* Return value of `mmap' in case of an error. */
#define MAP_FAILED ((__caddr_t) -1)
#define MAP_FAILED ((__ptr_t) -1)
__BEGIN_DECLS
@ -90,31 +90,31 @@ __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 __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));
extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
int __flags, int __fd, off_t __offset));
/* 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. */
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
__END_DECLS

View File

@ -25,16 +25,16 @@
is nonzero, it is the desired mapping address. If the MAP_FIXED bit is
set in FLAGS, the mapping will be at ADDR exactly (which must be
page-aligned); otherwise the system chooses a convenient nearby address.
The return value is the actual mapping address chosen or (caddr_t) -1
The return value is the actual mapping address chosen or MAP_FAILED
for errors (in which case `errno' is set). A successful `mmap' call
deallocates any previous mapping for the affected region. */
extern caddr_t __mmap_syscall (caddr_t addr, size_t len,
extern __ptr_t __mmap_syscall (__ptr_t addr, size_t len,
int prot, int flags, int fd, off_t offset);
caddr_t
__mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
__ptr_t
__mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
{
return __mmap_syscall (addr, len, prot, flags | _MAP_NEW, fd, offset);
}

View File

@ -74,7 +74,7 @@
#define MS_INVALIDATE 0x2 /* Invalidate caches. */
/* Return value of `mmap' in case of an error. */
#define MAP_FAILED ((__caddr_t) -1)
#define MAP_FAILED ((__ptr_t) -1)
__BEGIN_DECLS
@ -87,31 +87,31 @@ __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 __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));
extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
int __flags, int __fd, __off_t __offset));
/* 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. */
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
__END_DECLS

View File

@ -58,7 +58,7 @@
#endif
/* Return value of `mmap' in case of an error. */
#define MAP_FAILED ((__caddr_t) -1)
#define MAP_FAILED ((__ptr_t) -1)
__BEGIN_DECLS
@ -71,33 +71,33 @@ __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 __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));
extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
int __flags, int __fd, off_t __offset));
/* 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));
/* Ultrix 4 does not implement `msync' or `madvise'. */
/* 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. */
extern int msync __P ((caddr_t __addr, size_t __len));
extern int msync __P ((__ptr_t __addr, size_t __len));
#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
__END_DECLS

View File

@ -68,7 +68,7 @@
#define MS_INVALIDATE 0x2 /* Invalidate caches. */
/* Return value of `mmap' in case of an error. */
#define MAP_FAILED ((__caddr_t) -1)
#define MAP_FAILED ((__ptr_t) -1)
__BEGIN_DECLS
@ -81,31 +81,31 @@ __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 __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));
extern __ptr_t mmap __P ((__ptr_t __addr, size_t __len, int __prot,
int __flags, int __fd, __off_t __offset));
/* 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. */
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
__END_DECLS