Merge fixes

diff --git a/etc/afpd/fce_api.c b/etc/afpd/fce_api.c
index 2b00142f85e09d12471e6c21c23bfeef4f72925b..b2dead294445229bb3984c6018fd22a62744879d 100755 (executable)
--- a/etc/afpd/fce_api.c
+++ b/etc/afpd/fce_api.c
@@ -47,10 +47,10 @@
 #include <atalk/cnid.h>\r
 #include <atalk/unix.h>\r
 #include <atalk/fce_api.h>\r
+#include <atalk/globals.h>\r
 \r
 #include "fork.h"\r
 #include "file.h"\r
-#include "globals.h"\r
 #include "directory.h"\r
 #include "desktop.h"\r
 #include "volume.h"\r

diff --git a/etc/afpd/fce_util.c b/etc/afpd/fce_util.c
index 6340110eeb3f3363c885703ee06b70d48e33e567..6959509df027e3de6825faedb838c74bd7f0ce1c 100755 (executable)
--- a/etc/afpd/fce_util.c
+++ b/etc/afpd/fce_util.c
@@ -49,10 +49,10 @@
 #include <atalk/cnid.h>\r
 #include <atalk/unix.h>\r
 #include <atalk/fce_api.h>\r
+#include <atalk/globals.h>\r
 \r
 #include "fork.h"\r
 #include "file.h"\r
-#include "globals.h"\r
 #include "directory.h"\r
 #include "desktop.h"\r
 #include "volume.h"\r