mod_http: Use hostname from the correct context (thanks gryffus)

[prosody.git] / util-src / signal.c

diff --git a/util-src/signal.c b/util-src/signal.c
index e6853f62b5d1cdb7477825b6a464946f53c84685..961d2d3e06acda484613a0ebdfc54a8f25625586 100644 (file)
--- a/util-src/signal.c
+++ b/util-src/signal.c
@@ -29,10 +29,6 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#ifdef __unix__
-#include <sys/param.h>
-#endif
-
 #include "lua.h"
 #include "lauxlib.h"
 
@@ -169,13 +165,13 @@ static struct signal_event *last_event = NULL;
 
 static void sighook(lua_State *L, lua_Debug *ar)
 {
+  struct signal_event *event;
   /* restore the old hook */
   lua_sethook(L, Hsig, Hmask, Hcount);
 
   lua_pushstring(L, LUA_SIGNAL);
   lua_gettable(L, LUA_REGISTRYINDEX);
 
-  struct signal_event *event;
   while((event = signal_queue))
   {
     lua_pushnumber(L, event->Nsig);
@@ -330,7 +326,7 @@ static int l_raise(lua_State *L)
   return 1;
 }
 
-#ifdef __unix__
+#if defined(__unix__) || defined(__APPLE__)
 
 /* define some posix only functions */
 
@@ -377,7 +373,7 @@ static int l_kill(lua_State *L)
 static const struct luaL_Reg lsignal_lib[] = {
   {"signal", l_signal},
   {"raise", l_raise},
-#ifdef __unix__
+#if defined(__unix__) || defined(__APPLE__)
   {"kill", l_kill},
 #endif
   {NULL, NULL}