Merge master

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

diff --git a/include/atalk/cnid_dbd_private.h b/include/atalk/cnid_dbd_private.h
index 36dee3d8264890402fa6cc7b0f7d233c08efa706..d7484e42088d7c69ab71326f96d71c1d093bea86 100644 (file)
--- a/include/atalk/cnid_dbd_private.h
+++ b/include/atalk/cnid_dbd_private.h
@@ -43,7 +43,7 @@ struct cnid_dbd_rqst {
     ino_t   ino;
     uint32_t type;
     cnid_t  did;
-    char    *name;
+    const char *name;
     size_t  namelen;
 };
 
@@ -56,7 +56,7 @@ struct cnid_dbd_rply {
 };
 
 typedef struct CNID_private {
-    u_int32_t magic;
+    uint32_t magic;
     char      db_dir[MAXPATHLEN + 1]; /* Database directory without /.AppleDB appended */
     char      *cnidserver;
     char      *cnidport;