From: Frank Lahm <franklahm@googlemail.com>
Date: Wed, 11 Jan 2012 14:45:29 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into branch-allea
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=5737d08e3c85485df6ad56d7be7423d6309e9b94

Merge remote branch 'origin/master' into branch-allea
---

5737d08e3c85485df6ad56d7be7423d6309e9b94
diff --cc etc/cnid_dbd/usockfd.c
index ff1538b3,0b119209..c2e625f6
--- a/etc/cnid_dbd/usockfd.c
+++ b/etc/cnid_dbd/usockfd.c
@@@ -17,10 -19,17 +17,11 @@@
  #include <netinet/in.h>
  #include <arpa/inet.h>
  #include <netdb.h>
 -
 -#ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
 -#endif /* HAVE_SYS_TYPES_H */
 -#ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
 -#endif /* HAVE_SYS_TIME_H */
 -
  
  #include <atalk/logger.h>
+ #include <atalk/compat.h>
  #include "usockfd.h"
  
  #include <sys/select.h>