Merge sf

[netatalk.git] / include / atalk / volume.h

diff --git a/include/atalk/volume.h b/include/atalk/volume.h
index 53676ce8c43f3ad15c20075ebaab6fbcac05d8b5..c179e74b02fcf650b5253f2c808a37669e6a766e 100644 (file)
--- a/include/atalk/volume.h
+++ b/include/atalk/volume.h
@@ -91,19 +91,23 @@ struct vol {
 #endif /*__svr4__*/
 };
 
-#define AFPVOL_OPEN (1<<0)
+/* load_volumes() flags */
+#define LV_ALL (1 << 0)
 
+/* volume flags */
+#define AFPVOL_OPEN (1<<0)
 /* flags  for AFS and quota 0xxx0 */
 #define AFPVOL_GVSMASK  (7<<2)
-#define AFPVOL_NONE (0<<2)
+#define AFPVOL_NONE     (0<<2)
 #define AFPVOL_AFSGVS   (1<<2)
-#define AFPVOL_USTATFS  (2<<2)
-#define AFPVOL_UQUOTA   (4<<2)
+#define AFPVOL_USTATFS  (1<<3)
+#define AFPVOL_UQUOTA   (1<<4)
 
 /*
   Flags that alter volume behaviour.
   Keep in sync with libatalk/util/volinfo.c
 */
+#define AFPVOL_NOV2TOEACONV (1 << 5) /* no adouble:v2 to adouble:ea conversion */
 #define AFPVOL_RO        (1 << 8)   /* read-only volume */
 #define AFPVOL_NOHEX     (1 << 10)  /* don't do :hex translation */
 #define AFPVOL_USEDOTS   (1 << 11)  /* use real dots */