Merge master

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

diff --git a/include/atalk/volinfo.h b/include/atalk/volinfo.h
index 0f3a4024a6a36faedc4993783a731369e56237b3..51bf30fc90a3a908dbdce8973a40ff86a424a830 100644 (file)
--- a/include/atalk/volinfo.h
+++ b/include/atalk/volinfo.h
@@ -9,7 +9,7 @@
 #define VOLINFOFILE ".volinfo"
 
 typedef struct {
-    const u_int32_t option;
+    const uint32_t option;
     const char      *name;
 } vol_opt_name_t;
 
@@ -30,7 +30,7 @@ struct volinfo {
     int                 v_adouble;  /* default adouble format */
     int                 v_ad_options;
     int                 v_vfs_ea;
-    char                *(*ad_path)(const char *, int);
+    const char          *(*ad_path)(const char *, int);
     char                *v_dbd_host;
     char                *v_dbd_port;
 };