diff options
author | pixel <pixel> | 2004-03-01 07:41:47 +0000 |
---|---|---|
committer | pixel <pixel> | 2004-03-01 07:41:47 +0000 |
commit | 2a7ee340df72d9e357a94d3ecf671a62d5956a92 (patch) | |
tree | b0d03061764fadf303af790d0e68f79cd6df2032 /lib | |
parent | b4348d5503e3718bbb6d1a3b7109f049908d5625 (diff) |
Apple fixes...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Exceptions.cc | 10 | ||||
-rw-r--r-- | lib/Socket.cc | 1 | ||||
-rw-r--r-- | lib/TaskMan.cc | 2 |
3 files changed, 10 insertions, 3 deletions
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> |