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 #endif +#include "makepath.h" + #include #include @@ -44,9 +46,7 @@ # define S_IRWXUGO (S_IRWXU | S_IRWXG | S_IRWXO) #endif -#if STDC_HEADERS -# include -#endif +#include #include @@ -54,14 +54,7 @@ extern int errno; #endif -#if HAVE_STRING_H -# include -#else -# include -# ifndef strchr -# define strchr index -# endif -#endif +#include #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)