Merge remote branch 'sf/master'

diff --git a/include/atalk/util.h b/include/atalk/util.h
index 6dcaabe260146fc56545829daf3c0a4c1b1d9812..b6039735d064c77dec6149332f370087d39df7c7 100644 (file)
--- a/include/atalk/util.h
+++ b/include/atalk/util.h
@@ -178,10 +178,11 @@ extern const char *getcwdpath(void);
 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);
+
+#endif  /* _ATALK_UTIL_H */