From b1c8e0cd21d137342bc23b311fae36498cfe341f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Fri, 3 Nov 1995 23:30:15 +0100
Subject: [PATCH] now compiles
Rev: src/builtin_efuns.c:1.3
Rev: src/lpc_signal.c:1.5
Rev: src/modules/files/socket.c:1.3
Rev: src/rusage.c:1.3
---
src/builtin_efuns.c | 2 +-
src/lpc_signal.c | 4 ++--
src/modules/files/socket.c | 2 +-
src/rusage.c | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/builtin_efuns.c b/src/builtin_efuns.c
index bf2b6ab2d0..518e0f456c 100644
--- a/src/builtin_efuns.c
+++ b/src/builtin_efuns.c
@@ -22,7 +22,7 @@
#include "fsort.h"
#include "call_out.h"
#include "callback.h"
-#ifdef HAVE_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#ifdef HAVE_CRYPT_H
diff --git a/src/lpc_signal.c b/src/lpc_signal.c
index f82e4c188b..1430d55a89 100644
--- a/src/lpc_signal.c
+++ b/src/lpc_signal.c
@@ -291,7 +291,7 @@ static void f_signal(int args)
assign_svalue(signal_callbacks + signum, sp+1-args);
if(IS_ZERO(sp+1-args))
{
- switch(sig)
+ switch(signum)
{
case SIGCHLD:
func=sig_child;
@@ -307,7 +307,7 @@ static void f_signal(int args)
}else{
func=receive_signal;
}
- my_signal(sig, func);
+ my_signal(signum, func);
pop_n_elems(args);
}
diff --git a/src/modules/files/socket.c b/src/modules/files/socket.c
index 8a94fa17c5..a2c84c2c48 100644
--- a/src/modules/files/socket.c
+++ b/src/modules/files/socket.c
@@ -60,7 +60,7 @@ static void do_close(struct port *p)
if(p->fd >= 0)
{
if(close(p->fd) < 0)
- if(errno == RETRY)
+ if(errno == EINTR)
goto retry;
set_read_callback(p->fd,0,0);
diff --git a/src/rusage.c b/src/rusage.c
index d6ce21a1b3..0a93495239 100644
--- a/src/rusage.c
+++ b/src/rusage.c
@@ -3,17 +3,17 @@
||| uLPC is distributed as GPL (General Public License)
||| See the files COPYING and DISCLAIMER for more information.
\*/
+#include "global.h"
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef HAVE_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
#include <fcntl.h>
-#ifdef HAVE_TIME
+#ifdef HAVE_TIME_H
#include <time.h>
#endif
#include <errno.h>
-#include "global.h"
#include "types.h"
#include "rusage.h"
--
GitLab