X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=bb6a09c12ca8f895a6cac13a039c85213a3c1fb2;hb=fb2a33bb98f09325349f84f1007035e415d8175f;hp=123d6abea784f34af18a65c2241d3469af260ea2;hpb=c265d0a1c89653d1cd0f0fbef3cfdea8a84d3fa8;p=gnulib.git

diff --git a/lib/makepath.c b/lib/makepath.c
index 123d6abea..bb6a09c12 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -18,6 +18,17 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> and
    Jim Meyering <meyering@cs.utexas.edu>.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #ifdef __GNUC__
 #define alloca __builtin_alloca
 #else
@@ -38,17 +49,26 @@ char *alloca ();
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+
+#ifdef	STAT_MACROS_BROKEN
+#ifdef S_ISDIR
+#undef S_ISDIR
+#endif
+#endif	/* STAT_MACROS_BROKEN.  */
+
 #if !defined(S_ISDIR) && defined(S_IFDIR)
-#define	S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
 #ifdef STDC_HEADERS
 #include <stdlib.h>
 #endif
 
-#if defined (STDC_HEADERS) || defined (HAVE_ERRNO_H)
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
-#else
+#endif
+
+#ifndef STDC_HEADERS
 extern int errno;
 #endif