From 2a7ee340df72d9e357a94d3ecf671a62d5956a92 Mon Sep 17 00:00:00 2001
From: pixel <pixel>
Date: Mon, 1 Mar 2004 07:41:47 +0000
Subject: Apple fixes...

---
 lib/Exceptions.cc | 10 ++++++++--
 lib/Socket.cc     |  1 +
 lib/TaskMan.cc    |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/Exceptions.cc b/lib/Exceptions.cc
index caa0257..2ecafef 100644
--- a/lib/Exceptions.cc
+++ b/lib/Exceptions.cc
@@ -17,14 +17,20 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/* $Id: Exceptions.cc,v 1.31 2003-12-22 01:57:02 pixel Exp $ */
+/* $Id: Exceptions.cc,v 1.32 2004-03-01 07:41:48 pixel Exp $ */
 
-#include <malloc.h>
 #include <string.h>
 #include <errno.h>
 #include <stddef.h>
 #ifdef HAVE_CONFIG_H
 #include "config.h"
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+#else
+#ifndef __APPLE__
+#include <malloc.h>
+#endif
 #endif
 #ifdef DEBUG
 #include <iostream>
diff --git a/lib/Socket.cc b/lib/Socket.cc
index dd3d3fb..f3e28df 100644
--- a/lib/Socket.cc
+++ b/lib/Socket.cc
@@ -1,3 +1,4 @@
+#define _BSD_SOCKLEN_T_ int
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/lib/TaskMan.cc b/lib/TaskMan.cc
index cc24c80..1dcf331 100644
--- a/lib/TaskMan.cc
+++ b/lib/TaskMan.cc
@@ -1,5 +1,5 @@
 #include <signal.h>
-#include <wait.h>
+#include <sys/wait.h>
 #include <sys/poll.h>
 #include <errno.h>
 #include <string.h>
-- 
cgit v1.2.3