Merge master

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

diff --git a/etc/afpd/volume.h b/etc/afpd/volume.h
index 2b689faf570bdb17154bc9aa3a3747ffe2c51261..f06dcd7bf2f4c33de5a42dbce9fdd53b5a941c91 100644 (file)
--- a/etc/afpd/volume.h
+++ b/etc/afpd/volume.h
@@ -7,16 +7,12 @@
 #define AFPD_VOLUME_H 1
 
 #include <sys/types.h>
-#include <netatalk/endian.h>
+#include <arpa/inet.h>
 
 #include <atalk/volume.h>
 #include <atalk/cnid.h>
 #include <atalk/unicode.h>
-
-#include "globals.h"
-#if 0
-#include "hash.h"
-#endif
+#include <atalk/globals.h>
 
 extern struct vol       *getvolbyvid (const u_int16_t);
 extern int              ustatfs_getvolspace (const struct vol *,
@@ -25,14 +21,9 @@ extern int              ustatfs_getvolspace (const struct vol *,
 extern void             setvoltime (AFPObj *, struct vol *);
 extern int              pollvoltime (AFPObj *);
 extern void             load_volumes (AFPObj *obj);
-extern int              readvolfile(AFPObj *obj,
-                                    struct afp_volume_name *p1,
-                                    char *p2,
-                                    int user,
-                                    struct passwd *pwent);
 extern const struct vol *getvolumes(void);
 extern void             unload_volumes_and_extmap(void);
-extern char             *get_uuid(const AFPObj *obj, const char *volname);
+extern void             vol_fce_tm_event(void);
 
 /* FP functions */
 int afp_openvol      (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);