Merge master

[netatalk.git] / libatalk / compat / misc.c

diff --git a/libatalk/compat/misc.c b/libatalk/compat/misc.c
index 2fe6a7f3cfc6adec921b2a7a8ea9a53d0505d18f..0bd45a7318c871ab34c442ebc8fdaf4cad6c9cc7 100644 (file)
--- a/libatalk/compat/misc.c
+++ b/libatalk/compat/misc.c
@@ -1,15 +1,13 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include <atalk/compat.h>
 
-#ifndef HAVE_STRNLEN
-size_t strnlen(const char *s, size_t max)
+#if !defined HAVE_DIRFD && defined SOLARIS
+#include <dirent.h>
+int dirfd(DIR *dir)
 {
-    size_t len;
-  
-    for (len = 0; len < max; len++) {
-        if (s[len] == '\0') {
-            break;
-        }
-    }
-    return len;  
+    return dir->d_fd;
 }
 #endif