Merge master

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

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