Merge sf

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

diff --git a/etc/afpd/volume.h b/etc/afpd/volume.h
index fd2d22514ff086d42daaf6eae389a0b3cf970e95..ed59b2444141f1514c8b18bc8ebdbc5b4b0998e0 100644 (file)
--- a/etc/afpd/volume.h
+++ b/etc/afpd/volume.h
@@ -6,28 +6,20 @@
 #ifndef AFPD_VOLUME_H
 #define AFPD_VOLUME_H 1
 
-#include <sys/cdefs.h>
 #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 <atalk/globals.h>
 
-#include "globals.h"
-#if 0
-#include "hash.h"
-#endif
-
-extern struct vol       *getvolbyvid (const u_int16_t);
 extern int              ustatfs_getvolspace (const struct vol *,
-            VolSpace *, VolSpace *,
-            u_int32_t *);
+                                             VolSpace *, VolSpace *,
+                                             uint32_t *);
 extern void             setvoltime (AFPObj *, struct vol *);
 extern int              pollvoltime (AFPObj *);
-extern void             load_volumes (AFPObj *obj);
-extern const struct vol *getvolumes(void);
-extern void             unload_volumes_and_extmap(void);
+extern void             vol_fce_tm_event(void);
 
 /* FP functions */
 int afp_openvol      (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
@@ -39,6 +31,4 @@ int afp_closevol     (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size
 /* netatalk functions */
 extern void     close_all_vol   (void);
 
-struct vol *current_vol;        /* last volume from getvolbyvid() */
-
 #endif