X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fmakepath.c;h=422bcda82ac5c27113e04d6570b4d753b6bfa150;hb=55da53d0db0c7a9fd82b2abc809560b3089df6a5;hp=f2dfe8891411e582f61f8a7cee175f538b5aee71;hpb=055db7703d609d36e4c35a3967c3625237bcef61;p=gnulib.git

diff --git a/lib/makepath.c b/lib/makepath.c
index f2dfe8891..422bcda82 100644
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -23,6 +23,8 @@
 # include <config.h>
 #endif
 
+#include "makepath.h"
+
 #include <alloca.h>
 
 #include <stdio.h>
@@ -44,9 +46,7 @@
 # define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO)
 #endif
 
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
 
 #include <errno.h>
 
@@ -54,14 +54,7 @@
 extern int errno;
 #endif
 
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
+#include <string.h>
 
 #ifndef S_ISUID
 # define S_ISUID 04000
@@ -88,8 +81,6 @@ extern int errno;
 
 #define WX_USR (S_IWUSR | S_IXUSR)
 
-#include "makepath.h"
-
 #include "gettext.h"
 #define _(msgid) gettext (msgid)