Forward-Ports from the stabilizing branch.

[netatalk.git] / libatalk / netddp / netddp_recvfrom.c

diff --git a/libatalk/netddp/netddp_recvfrom.c b/libatalk/netddp/netddp_recvfrom.c
index b7974614932018188f7d89c051a6cc9541d2ec92..6ee199aa3b37137e2d469af0e6dcb7ce2d89e7af 100644 (file)
--- a/libatalk/netddp/netddp_recvfrom.c
+++ b/libatalk/netddp/netddp_recvfrom.c
@@ -1,4 +1,6 @@
 /* 
+ * $Id: netddp_recvfrom.c,v 1.4 2001-11-25 21:55:10 srittau Exp $
+ *
  * Copyright (c) 1999 Adrian Sun (asun@zoology.washington.edu)
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
@@ -6,19 +8,25 @@
  * receive data.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 static int _netddp_recvfrom_dummy;
 
 #ifndef NO_DDP
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif /* HAVE_UNISTD_H */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <errno.h>
 
 #ifdef MACOSX_SERVER
-#include <at/appletalk.h>
-#include <at/ddp.h>
-#endif
+#include <netat/appletalk.h>
+#include <netat/ddp.h>
+#endif /* MACOSX_SERVER */
 
 #include <netatalk/at.h>
 #include <netatalk/endian.h>
@@ -27,7 +35,7 @@ static int _netddp_recvfrom_dummy;
 
 #ifndef MAX
 #define MAX(a, b)  ((a) < (b) ? (b) : (a))
-#endif
+#endif /* ! MAX */
 
 #ifdef MACOSX_SERVER
 int netddp_recvfrom(int fd, void *buf, int buflen, unsigned int dummy,