diff options
Diffstat (limited to 'sysdeps/mach/hurd')
| -rw-r--r-- | sysdeps/mach/hurd/bits/ioctls.h | 6 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/dl-sysdep.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/mach/hurd/bits/ioctls.h b/sysdeps/mach/hurd/bits/ioctls.h index a5dc446c67..1145560ab9 100644 --- a/sysdeps/mach/hurd/bits/ioctls.h +++ b/sysdeps/mach/hurd/bits/ioctls.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1993, 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef _SYS_IOCTL_H -# error "Never use <bits/ioctls.h> directly; include <sys/ioctl.h> instead." +#if !defined _HURD_IOCTL_H && !defined _SYS_IOCTLS_H +# error "Never use <bits/ioctls.h> directly; include <hurd/ioctl.h> instead." #endif /* These macros are also defined in <bits/termios.h> (with numerically diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 7c936e9466..6fd6ea356f 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -546,8 +546,8 @@ __close (int fd) return 0; } -caddr_t weak_function -__mmap (caddr_t addr, size_t len, int prot, int flags, int fd, off_t offset) +__ptr_t weak_function +__mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset) { error_t err; vm_prot_t vmprot; @@ -656,7 +656,7 @@ _dl_sysdep_message (const char *msg, ...) ? VM_INHERIT_SHARE : VM_INHERIT_COPY); } - return err ? (caddr_t) __hurd_fail (err) : (caddr_t) mapaddr; + return err ? (__ptr_t) __hurd_fail (err) : (__ptr_t) mapaddr; } void weak_function |