X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fglob.c;h=38927d388f735ef7ce9a50c22bfeec607bca7921;hb=3667f8e75409ce7df7bc3f561ddd8d03d5be39f2;hp=a2b0d89f2d1c9b47fdc1cf955409f41cae60af2f;hpb=efc5123c9d851509aea5dd30f47c91e7e5a5c8dd;p=gnulib.git

diff --git a/lib/glob.c b/lib/glob.c
index a2b0d89f2..38927d388 100644
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -16,7 +16,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifdef	HAVE_CONFIG_H
+#ifndef _LIBC
 # include <config.h>
 #endif
 
@@ -93,7 +93,7 @@
 # endif
 
 # define CONVERT_DIRENT_DIRENT64(d64, d32) \
-  memcpy ((d64)->d_name, (d32)->d_name, NAMLEN (d32) + 1);		      \
+  memcpy ((d64)->d_name, (d32)->d_name, _D_EXACT_NAMLEN (d32) + 1);	      \
   CONVERT_D_INO (d64, d32)						      \
   CONVERT_D_TYPE (d64, d32)
 #endif
@@ -1176,7 +1176,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
 			  struct globlink *new =
 			    __alloca (sizeof (struct globlink));
 			  char *p;
-			  len = NAMLEN (d);
+			  len = _D_EXACT_NAMLEN (d);
 			  new->name =
 			    malloc (len + 1 + ((flags & GLOB_MARK) && isdir));
 			  if (new->name == NULL)