Merge sf/master

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

diff --git a/etc/afpd/status.h b/etc/afpd/status.h
index c4a696bd590b9698903711e6c6d700eabf9e0168..ae16bb49c0cc2fb6d1cf50088e667e6351c60ff1 100644 (file)
--- a/etc/afpd/status.h
+++ b/etc/afpd/status.h
@@ -1,14 +1,11 @@
-/*
- * $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 */
@@ -43,7 +40,7 @@ extern void status_versions (char * /*status*/, const ASP, 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 set_signature(struct afp_options *);
 
 /* FP functions */
 int afp_getsrvrinfo (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);