Merge master

[netatalk.git] / libatalk / cnid / cdb / cnid_cdb_private.h

diff --git a/libatalk/cnid/cdb/cnid_cdb_private.h b/libatalk/cnid/cdb/cnid_cdb_private.h
index 7d9142a7bafdc53d06f7b52fd6e208a6663363ae..ff28be84c9d399e309837bb0257fcf792d67a22c 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_private.h
+++ b/libatalk/cnid/cdb/cnid_cdb_private.h
@@ -1,7 +1,3 @@
-/*
- * $Id: cnid_cdb_private.h,v 1.6 2009-11-19 01:17:31 didg Exp $
- */
-
 #ifndef LIBATALK_CDB_PRIVATE_H
 #define LIBATALK_CDB_PRIVATE_H 1
 
@@ -9,26 +5,17 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
-#include <netatalk/endian.h>
-
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif /* HAVE_UNISTD_H */
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
-#endif /* HAVE_FCNTL_H */
 #include <sys/param.h>
 #include <sys/stat.h>
-#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
-#ifdef HAVE_TIME_H
 #include <time.h>
-#endif
-#include <sys/cdefs.h>
+#include <arpa/inet.h>
+
 #include <db.h>
 
 #include <atalk/logger.h>
@@ -132,7 +119,7 @@ typedef struct CNID_private {
  */
 
 /* construct db_cnid data. NOTE: this is not re-entrant.  */
-extern unsigned char *make_cnid_data (const struct stat *,const cnid_t ,
+extern unsigned char *make_cnid_data (u_int32_t flags, const struct stat *,const cnid_t ,
                                        const char *, const size_t );
 
 #endif /* atalk/cnid/cnid_private.h */