Merge master

[netatalk.git] / etc / afpd / afp_config.h

diff --git a/etc/afpd/afp_config.h b/etc/afpd/afp_config.h
index 5db8217846abdf85f48e892b4c7d3caf8cfede28..022a6e65d41e1c979fb7597408b41fb1dd47c139 100644 (file)
--- a/etc/afpd/afp_config.h
+++ b/etc/afpd/afp_config.h
@@ -2,9 +2,7 @@
 #define AFPD_CONFIG_H 1
 
 #include <atalk/server_child.h>
-#include <atalk/atp.h>
-
-#include "globals.h"
+#include <atalk/globals.h>
 
 typedef struct AFPConfig {
     AFPObj obj;
@@ -12,7 +10,7 @@ typedef struct AFPConfig {
     unsigned char *optcount;
     char status[1400];
     const void *defoptions, *signature;
-    int (*server_start) (struct AFPConfig *, struct AFPConfig *,
+    afp_child_t *(*server_start) (struct AFPConfig *, struct AFPConfig *,
                              server_child *);
     void (*server_cleanup) (const struct AFPConfig *);
     struct AFPConfig *next;