From: Frank Lahm <franklahm@googlemail.com>
Date: Tue, 31 May 2011 13:24:44 +0000 (+0200)
Subject: Merge fixes
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=2b6ffb426517b26bd0589efbb4c3eaec0545c1c4

Merge fixes
---

diff --git a/etc/afpd/fce_api.c b/etc/afpd/fce_api.c
index 2b00142f..b2dead29 100755
--- a/etc/afpd/fce_api.c
+++ b/etc/afpd/fce_api.c
@@ -47,10 +47,10 @@
 #include <atalk/cnid.h>
 #include <atalk/unix.h>
 #include <atalk/fce_api.h>
+#include <atalk/globals.h>
 
 #include "fork.h"
 #include "file.h"
-#include "globals.h"
 #include "directory.h"
 #include "desktop.h"
 #include "volume.h"
diff --git a/etc/afpd/fce_util.c b/etc/afpd/fce_util.c
index 6340110e..6959509d 100755
--- a/etc/afpd/fce_util.c
+++ b/etc/afpd/fce_util.c
@@ -49,10 +49,10 @@
 #include <atalk/cnid.h>
 #include <atalk/unix.h>
 #include <atalk/fce_api.h>
+#include <atalk/globals.h>
 
 #include "fork.h"
 #include "file.h"
-#include "globals.h"
 #include "directory.h"
 #include "desktop.h"
 #include "volume.h"