First working IPC reconnect

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

diff --git a/etc/afpd/file.h b/etc/afpd/file.h
index 9d3ca116177d0145d17cc189b1fb61e77605404f..077cd1203b214f98eebccb634fc8b83c82593dcc 100644 (file)
--- a/etc/afpd/file.h
+++ b/etc/afpd/file.h
@@ -1,5 +1,5 @@
 /*
- * $Id: file.h,v 1.25 2010-02-10 14:05:37 franklahm Exp $
+ * $Id: file.h,v 1.26 2010/03/12 15:16:49 franklahm Exp $
  *
  * Copyright (c) 1990,1991 Regents of The University of Michigan.
  * All Rights Reserved.
@@ -31,8 +31,8 @@
 #include <sys/cdefs.h>
 #include <netatalk/endian.h>
 #include <atalk/adouble.h>
+#include <atalk/globals.h>
 
-#include "globals.h"
 #include "volume.h"
 #include "directory.h"
 
@@ -115,9 +115,9 @@ extern int getfilparams (struct vol *, u_int16_t, struct path *,
                                  struct dir *, char *buf, size_t *);
 
 extern int setfilparams (struct vol *, struct path *, u_int16_t, char *);
-extern int renamefile   (const struct vol *, char *, char *, char *, struct adouble *);
-extern int copyfile     (const struct vol *, const struct vol *, char *, char *, char *, struct adouble *);
-extern int deletefile   (const struct vol *, char *, int);
+extern int renamefile   (const struct vol *, int, char *, char *, char *, struct adouble *);
+extern int copyfile     (const struct vol *, const struct vol *, int, char *, char *, char *, struct adouble *);
+extern int deletefile   (const struct vol *, int, char *, int);
 
 extern int getmetadata  (struct vol *vol, u_int16_t bitmap, struct path *path, 
                          struct dir *dir, char *buf, size_t *buflen, struct adouble *adp);
@@ -127,8 +127,12 @@ extern void *get_finderinfo (const struct vol *, const char *, struct adouble *,
 extern size_t mtoUTF8   (const struct vol *, const char *, size_t , char *, size_t );
 extern int  copy_path_name (const struct vol *, char *, char *i);
 
-extern u_int32_t get_id  (struct vol *, struct adouble *, const struct stat *,
-                                const cnid_t , char *, const int );
+extern uint32_t get_id  (struct vol *,
+                         struct adouble *,
+                         const struct stat *,
+                         cnid_t ,
+                         const char *,
+                         int );
 
 /* FP functions */
 int afp_exchangefiles (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);