aboutsummaryrefslogtreecommitdiff
path: root/src/smtpap
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2002-09-03 18:44:24 +0000
committerNick Mathewson <nickm@torproject.org>2002-09-03 18:44:24 +0000
commitfdb31225b7206fdd35d62d00b5369ac81691003b (patch)
tree7e8aebcbca6d607a3e0922083c0f81dde539ebfc /src/smtpap
parent8878d8cc27d94839053063aa8925d6f2620f4c20 (diff)
downloadtor-fdb31225b7206fdd35d62d00b5369ac81691003b.tar
tor-fdb31225b7206fdd35d62d00b5369ac81691003b.tar.gz
Port to MacOS X
svn:r88
Diffstat (limited to 'src/smtpap')
-rw-r--r--src/smtpap/io.c3
-rw-r--r--src/smtpap/smtpap.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/src/smtpap/io.c b/src/smtpap/io.c
index 57ea72854..f45e5cf3c 100644
--- a/src/smtpap/io.c
+++ b/src/smtpap/io.c
@@ -1,7 +1,8 @@
#include <sys/time.h>
#include <stdarg.h>
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
+#include <string.h>
#include "../common/log.h"
#include "../common/utils.h"
diff --git a/src/smtpap/smtpap.c b/src/smtpap/smtpap.c
index 0e97eaff0..ae3ad5d1e 100644
--- a/src/smtpap/smtpap.c
+++ b/src/smtpap/smtpap.c
@@ -8,6 +8,9 @@
/*
* Changes :
* $Log$
+ * Revision 1.4 2002/09/03 18:44:24 nickm
+ * Port to MacOS X
+ *
* Revision 1.3 2002/08/24 07:56:34 arma
* proxies send port in host order as ascii string
*
@@ -114,6 +117,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/time.h>
+#include <sys/wait.h>
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
@@ -122,7 +126,6 @@
#include <stdio.h>
#include <unistd.h>
#include <signal.h>
-#include <wait.h>
#include <stdarg.h>
#include <ctype.h>
#include <stdint.h>