merge with 3.5

1 files changed, 2 insertions, 4 deletions

diff --git a/src/ls.c b/src/ls.c
index f90e4291c..2926eafac 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -43,8 +43,8 @@
 #include <grp.h>
 #include <pwd.h>
 #include <getopt.h>
-#include <fnmatch.h>
 #include "system.h"
+#include <fnmatch.h>
 #include "version.h"
 
 #ifndef S_IEXEC
@@ -58,9 +58,7 @@
 #define longdiff(a, b) ((a) - (b))
 #endif
 
-#ifdef STDC_HEADERS
-#include <time.h>
-#else
+#ifndef STDC_HEADERS
 char *ctime ();
 time_t time ();
 #endif