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

diff --git a/etc/cnid_dbd/comm.c b/etc/cnid_dbd/comm.c
index 23c6a58edaa18cfdeef1189759c047453ffd2416..7cd8f5598c7cff49930ac147f799e7dea1d210bb 100644 (file)
--- a/etc/cnid_dbd/comm.c
+++ b/etc/cnid_dbd/comm.c
@@ -28,6 +28,7 @@
 #include <atalk/logger.h>
 #include <atalk/util.h>
 #include <atalk/cnid_dbd_private.h>
+#include <atalk/compat.h>
 
 #include "db_param.h"
 #include "usockfd.h"

diff --git a/etc/cnid_dbd/usockfd.c b/etc/cnid_dbd/usockfd.c
index ff1538b340c334c2428457455c8e3cf2bfda9f21..c2e625f6d3b1813862496c32bfcece9303ee5de9 100644 (file)
--- a/etc/cnid_dbd/usockfd.c
+++ b/etc/cnid_dbd/usockfd.c
@@ -21,6 +21,7 @@
 #include <sys/time.h>
 
 #include <atalk/logger.h>
+#include <atalk/compat.h>
 #include "usockfd.h"
 
 #include <sys/select.h>