Merge master

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

diff --git a/etc/afpd/status.h b/etc/afpd/status.h
index c4a696bd590b9698903711e6c6d700eabf9e0168..6bae26fa6c8bc7b98c2bcb50c5252684a050c64a 100644 (file)
--- a/etc/afpd/status.h
+++ b/etc/afpd/status.h
@@ -1,14 +1,9 @@
-/*
- * $Id: status.h,v 1.11 2010-03-29 15:22:57 franklahm Exp $
- */
-
 #ifndef AFPD_STATUS_H
 #define AFPD_STATUS_H 1
 
-#include <sys/cdefs.h>
 #include <atalk/dsi.h>
-#include <atalk/asp.h>
-#include "globals.h"
+#include <atalk/globals.h>
+
 #include "afp_config.h"
 
 /* we use these to prevent whacky alignment problems */
@@ -39,11 +34,10 @@
 #define PASSWD_NOSAVE  (1 << 1)
 #define PASSWD_ALL     (PASSWD_SET | PASSWD_NOSAVE)
 
-extern void status_versions (char * /*status*/, const ASP, const DSI *);
+extern void status_versions (char * /*status*/, const DSI *);
 extern void status_uams (char * /*status*/, const char * /*authlist*/);
-extern void status_init (AFPConfig *, AFPConfig *,
-                                 const struct afp_options *);
-extern void set_signature(char *, struct afp_options *);
+extern void status_init (AFPConfig *, const struct afp_options *);
+extern void set_signature(struct afp_options *);
 
 /* FP functions */
 int afp_getsrvrinfo (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);