merge with 1.6

[gnulib.git] / lib / makepath.c

diff --git a/lib/makepath.c b/lib/makepath.c
index 123d6ab..e615790 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -46,9 +46,11 @@ char *alloca ();
 #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