summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-10-04 10:08:51 +0000
committerEric Andersen <andersen@codepoet.org>2001-10-04 10:08:51 +0000
commitab79ee6808a768bc72cd1158f93ba8a50a0615e5 (patch)
tree098c71fcd2806ff9a8bc8820bffbf1e08f6c5f5d
parent0ee72c0b1534e16e6240e99f822b2401cfc1dd4d (diff)
Yet more minor cleanups
-rw-r--r--libc/inet/resolv.c4
-rw-r--r--libc/sysdeps/linux/common/syscalls.c16
-rw-r--r--libc/sysdeps/linux/i386/brk.c5
3 files changed, 16 insertions, 9 deletions
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c
index e5558fbde..97e3a3897 100644
--- a/libc/inet/resolv.c
+++ b/libc/inet/resolv.c
@@ -1132,7 +1132,7 @@ struct netent * getnetbyname(const char * name)
#ifdef L_res_init
-int res_init()
+int res_init(void)
{
return(0);
}
@@ -1181,7 +1181,7 @@ int res_query(const char *dname, int class, int type,
#ifdef L_gethostbyaddr
-struct hostent *gethostbyaddr (const void *addr, __socklen_t len, int type)
+struct hostent *gethostbyaddr (const void *addr, socklen_t len, int type)
{
static struct hostent h;
static char namebuf[256];
diff --git a/libc/sysdeps/linux/common/syscalls.c b/libc/sysdeps/linux/common/syscalls.c
index 78c1463b0..05179548d 100644
--- a/libc/sysdeps/linux/common/syscalls.c
+++ b/libc/sysdeps/linux/common/syscalls.c
@@ -282,7 +282,8 @@ _syscall0(void, sync);
//#define __NR_kill 37
#ifdef L_kill
-//#include <signal.h>
+#include <signal.h>
+#undef kill
_syscall2(int, kill, pid_t, pid, int, sig);
#endif
@@ -498,8 +499,8 @@ _syscall0(pid_t, setsid);
//#define __NR_sigaction 67
#ifdef L_sigaction
-//#include <signal.h>
-struct sigaction;
+#include <signal.h>
+#undef sigaction
_syscall3(int, sigaction, int, signum, const struct sigaction *, act,
struct sigaction *, oldact);
#endif
@@ -522,13 +523,15 @@ _syscall2(int, setregid, gid_t, rgid, gid_t, egid);
//#define __NR_sigsuspend 72
#ifdef L_sigsuspend
-//#include <signal.h>
+#include <signal.h>
+#undef sigsuspend
_syscall1(int, sigsuspend, const sigset_t *, mask);
#endif
//#define __NR_sigpending 73
#ifdef L_sigpending
-//#include <signal.h>
+#include <signal.h>
+#undef sigpending
_syscall1(int, sigpending, sigset_t *, set);
#endif
@@ -942,7 +945,8 @@ _syscall3(int, mprotect, void *, addr, size_t, len, int, prot);
//#define __NR_sigprocmask 126
#ifdef L_sigprocmask
-//#include <signal.h>
+#include <signal.h>
+#undef sigprocmask
_syscall3(int, sigprocmask, int, how, const sigset_t *, set, sigset_t *,
oldset);
#endif
diff --git a/libc/sysdeps/linux/i386/brk.c b/libc/sysdeps/linux/i386/brk.c
index eca0e8326..9ae565631 100644
--- a/libc/sysdeps/linux/i386/brk.c
+++ b/libc/sysdeps/linux/i386/brk.c
@@ -21,13 +21,16 @@
#include <unistd.h>
#include <sys/syscall.h>
+#ifndef __ptrvalue
+#define __ptrvalue
+#endif
/* This must be initialized data because commons can't have aliases. */
void *___brk_addr = 0;
int brk (void *addr)
{
- void *__unbounded newbrk, *__unbounded scratch;
+ void *newbrk, *scratch;
asm ("movl %%ebx, %1\n" /* Save %ebx in scratch register. */
"movl %3, %%ebx\n" /* Put ADDR in %ebx to be syscall arg. */