diff options
Diffstat (limited to 'sysdeps/unix')
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/socket.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/errlist.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getresgid.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getresuid.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/poll.c | 8 |
5 files changed, 21 insertions, 9 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h index 34c2be4271..0476c15c00 100644 --- a/sysdeps/unix/sysv/linux/bits/socket.h +++ b/sysdeps/unix/sysv/linux/bits/socket.h @@ -1,5 +1,5 @@ /* System-specific socket constants and types. Linux version. - Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc. + Copyright (C) 1991, 92, 94, 95, 96, 97, 98 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 @@ -70,7 +70,7 @@ enum __socket_type #define PF_DECnet 12 /* Reserved for DECnet project */ #define PF_NETBEUI 13 /* Reserved for 802.2LLC project*/ #define PF_SECURITY 14 /* Security callback pseudo AF */ -#define pseudo_PF_KEY 15 /* PF_KEY key management API */ +#define PF_KEY 15 /* PF_KEY key management API */ #define PF_NETLINK 16 #define PF_ROUTE PF_NETLINK /* Alias to emulate 4.4BSD */ #define PF_PACKET 17 /* Packet family */ @@ -94,7 +94,7 @@ enum __socket_type #define AF_DECnet PF_DECnet #define AF_NETBEUI PF_NETBEUI #define AF_SECURITY PF_SECURITY -#define AF_KEY pseudo_PF_KEY +#define pseudo_AF_KEY PF_KEY #define AF_NETLINK PF_NETLINK #define AF_ROUTE PF_ROUTE #define AF_PACKET PF_PACKET diff --git a/sysdeps/unix/sysv/linux/errlist.c b/sysdeps/unix/sysv/linux/errlist.c index 7349d67c62..af28a45954 100644 --- a/sysdeps/unix/sysv/linux/errlist.c +++ b/sysdeps/unix/sysv/linux/errlist.c @@ -45,11 +45,7 @@ symbol_version (__old_sys_errlist, _sys_errlist, GLIBC_2.0); symbol_version (_old_sys_errlist, sys_errlist, GLIBC_2.0); strong_alias (__new_sys_nerr, _new_sys_nerr) -#if 0 default_symbol_version (__new_sys_nerr, _sys_nerr, GLIBC_2.1); -#else -strong_alias (__new_sys_nerr, _sys_nerr); -#endif default_symbol_version (_new_sys_nerr, sys_nerr, GLIBC_2.1); strong_alias (__new_sys_errlist, _new_sys_errlist) default_symbol_version (__new_sys_errlist, _sys_errlist, GLIBC_2.1); diff --git a/sysdeps/unix/sysv/linux/getresgid.c b/sysdeps/unix/sysv/linux/getresgid.c index 2fe461a787..4c326d5ba9 100644 --- a/sysdeps/unix/sysv/linux/getresgid.c +++ b/sysdeps/unix/sysv/linux/getresgid.c @@ -21,6 +21,9 @@ #include <linux/posix_types.h> +#include <sys/syscall.h> +#ifdef __NR_getresgid + extern int __syscall_getresgid (__kernel_gid_t *rgid, __kernel_gid_t *egid, __kernel_gid_t *sgid); @@ -37,3 +40,6 @@ getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid) *sgid = (gid_t) k_sgid; return 0; } +#else +# include <sysdeps/generic/getresgid.c> +#endif diff --git a/sysdeps/unix/sysv/linux/getresuid.c b/sysdeps/unix/sysv/linux/getresuid.c index 89b8fa7cfe..6b6bc37290 100644 --- a/sysdeps/unix/sysv/linux/getresuid.c +++ b/sysdeps/unix/sysv/linux/getresuid.c @@ -21,6 +21,9 @@ #include <linux/posix_types.h> +#include <sys/syscall.h> +#ifdef __NR_getresuid + extern int __syscall_getresuid (__kernel_uid_t *ruid, __kernel_uid_t *euid, __kernel_uid_t *suid); @@ -37,3 +40,6 @@ getresuid (uid_t *ruid, uid_t *euid, uid_t *suid) *suid = (uid_t) k_suid; return 0; } +#else +# include <sysdeps/generic/getresuid.c> +#endif diff --git a/sysdeps/unix/sysv/linux/poll.c b/sysdeps/unix/sysv/linux/poll.c index f6e71b79b6..e37df4cb9e 100644 --- a/sysdeps/unix/sysv/linux/poll.c +++ b/sysdeps/unix/sysv/linux/poll.c @@ -1,5 +1,5 @@ /* Poll system call, with emulation if it is not available. - Copyright (C) 1997 Free Software Foundation, Inc. + Copyright (C) 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 @@ -20,6 +20,9 @@ #include <errno.h> #include <sys/poll.h> +#include <sys/syscall.h> +#ifdef __NR_poll + extern int __syscall_poll __P ((struct pollfd *fds, unsigned int nfds, int timeout)); weak_extern (__syscall_poll) @@ -58,6 +61,7 @@ poll (fds, nfds, timeout) /* Get the emulation code. */ -#define poll(fds, nfds, timeout) \ +# define poll(fds, nfds, timeout) \ static internal_function __emulate_poll (fds, nfds, timeout) +#endif #include <sysdeps/unix/bsd/poll.c> |