From: Bruno Haible <bruno@clisp.org>
Date: Fri, 19 Mar 2010 23:20:36 +0000 (+0100)
Subject: scandir: Fix link error on Solaris 8.
X-Git-Tag: v0.1~4475
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=1f1ace512e67366389ffe4b94ce83c636716cf4e;p=gnulib.git

scandir: Fix link error on Solaris 8.
---

diff --git a/ChangeLog b/ChangeLog
index bac7b1a83..c2e21c9e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-03-19  Bruno Haible  <bruno@clisp.org>
 
+	scandir: Fix link error on Solaris 8.
+	* lib/scandir.c (_D_EXACT_NAMLEN, _D_ALLOC_NAMLEN): New fallback
+	macros.
+
+2010-03-19  Bruno Haible  <bruno@clisp.org>
+
 	getusershell: Fix documentation.
 	* doc/glibc-functions/endusershell.texi: Refer to the getusershell
 	module.
diff --git a/lib/scandir.c b/lib/scandir.c
index 498134f2f..63f70ad9c 100644
--- a/lib/scandir.c
+++ b/lib/scandir.c
@@ -33,6 +33,13 @@
 
 #undef select
 
+#ifndef _D_EXACT_NAMLEN
+# define _D_EXACT_NAMLEN(d) strlen ((d)->d_name)
+#endif
+#ifndef _D_ALLOC_NAMLEN
+# define _D_ALLOC_NAMLEN(d) (_D_EXACT_NAMLEN (d) + 1)
+#endif
+
 #if _LIBC
 # ifndef SCANDIR
 #  define SCANDIR scandir