From: Jim Meyering <jim@meyering.net>
Date: Wed, 10 Sep 2003 08:49:49 +0000 (+0000)
Subject: Include makepath.h first, to test interface.
X-Git-Tag: v5.1.0~761
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d87ae92fb80f875037d28f714ba94378b537da5;p=thirdparty%2Fcoreutils.git

Include makepath.h first, to test interface.
Include <stdlib.h> and <string.h> unconditionally.
---

diff --git a/lib/makepath.c b/lib/makepath.c
index f2dfe88914..422bcda82a 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)