Trunk-BP: includes cleanup.

[netatalk.git] / libatalk / nbp / nbp_unrgstr.c

diff --git a/libatalk/nbp/nbp_unrgstr.c b/libatalk/nbp/nbp_unrgstr.c
index 49cf2ace772ff662371940224133a3aacbfc9ba8..35fb80f94c7189a1bc1e71bc20467661131d997f 100644 (file)
--- a/libatalk/nbp/nbp_unrgstr.c
+++ b/libatalk/nbp/nbp_unrgstr.c
@@ -1,28 +1,38 @@
 /*
+ * $Id: nbp_unrgstr.c,v 1.3.2.1 2002-02-08 00:04:49 srittau Exp $
+ *
  * Copyright (c) 1990,1997 Regents of The University of Michigan.
  * All Rights Reserved. See COPYRIGHT.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include <string.h>
+#include <errno.h>
+#include <signal.h>
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/signal.h>
 #include <sys/time.h>
-#include <errno.h>
+
 #include <netatalk/endian.h>
 #include <netatalk/at.h>
 #include <atalk/nbp.h>
 #include <atalk/netddp.h>
 #include <atalk/ddp.h>
 
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif /* HAVE_NETDB_H */
 #include  "nbp_conf.h"
 
 /* FIXME/SOCKLEN_T: socklen_t is a unix98 feature. */
 #ifndef SOCKLEN_T
 #define SOCKLEN_T unsigned int
-#endif
+#endif /* ! SOCKLEN_T */
 
 int nbp_unrgstr( obj, type, zone, addr )
     const char         *obj, *type, *zone;
@@ -86,7 +96,7 @@ int nbp_unrgstr( obj, type, zone, addr )
       memcpy(&to.sat_addr, addr, sizeof(struct at_addr));
 #ifdef BSD4_4
     to.sat_len = sizeof( struct sockaddr_at );
-#endif BSD4_4
+#endif /* BSD4_4 */
 
     if ( nbp_port == 0 ) {
        if (( se = getservbyname( "nbp", "ddp" )) == NULL ) {