diff options
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/error.c | 5 | ||||
| -rw-r--r-- | misc/sys/mman.h | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/misc/error.c b/misc/error.c index ca7f3b47b8..2af2cc5b90 100644 --- a/misc/error.c +++ b/misc/error.c @@ -157,7 +157,10 @@ error (status, errnum, message, va_alist) { #if defined HAVE_STRERROR_R || defined _LIBC char errbuf[1024]; - fprintf (stderr, ": %s", __strerror_r (errnum, errbuf, sizeof errbuf)); + /* Don't use __strerror_r's return value because on some systems + (at least DEC UNIX 4.0[A-D]) strerror_r returns `int'. */ + __strerror_r (errnum, errbuf, sizeof errbuf); + fprintf (stderr, ": %s", errbuf); #else fprintf (stderr, ": %s", strerror (errnum)); #endif diff --git a/misc/sys/mman.h b/misc/sys/mman.h index 44d0d26340..92b4bf85a0 100644 --- a/misc/sys/mman.h +++ b/misc/sys/mman.h @@ -42,15 +42,15 @@ __BEGIN_DECLS #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, __off_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)); + int __flags, int __fd, __off64_t __offset)); #endif /* Deallocate any mapping for the region starting at ADDR and extending LEN @@ -94,7 +94,7 @@ extern int munlockall __P ((void)); NEW_LEN. If MAY_MOVE is MREMAP_MAYMOVE the returned address may differ from ADDR. */ extern __ptr_t mremap __P ((__ptr_t __addr, size_t __old_len, - size_t __new_len, int __may_move)); + size_t __new_len, int __may_move)); #endif __END_DECLS |