Merge 2-1

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

diff --git a/include/atalk/util.h b/include/atalk/util.h
index 457b0c8a97a9dda25f01750705a06b6f50c417b1..999f14daac86349e508be888df10e0a40a987123 100644 (file)
--- a/include/atalk/util.h
+++ b/include/atalk/util.h
@@ -18,7 +18,9 @@
 #endif /* HAVE_UNISTD_H */
 #include <poll.h>
 #include <netatalk/at.h>
+
 #include <atalk/unicode.h>
+#include <atalk/bstrlib.h>
 
 /* exit error codes */
 #define EXITERR_CLNT 1  /* client related error */
@@ -167,3 +169,9 @@ extern char *stripped_slashes_basename(char *p);
 extern int lchdir(const char *dir);
 extern void randombytes(void *buf, int n);
 #endif  /* _ATALK_UTIL_H */
+
+/******************************************************************
+ * cnid.c
+ *****************************************************************/
+
+extern bstring rel_path_in_vol(const char *path, const char *volpath);