summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/backupfile.c4
-rw-r--r--old/fileutils/ChangeLog26
-rw-r--r--src/ls.c6
-rw-r--r--src/touch.c4
4 files changed, 33 insertions, 7 deletions
diff --git a/lib/backupfile.c b/lib/backupfile.c
index 7a624cfec..f15e530bf 100644
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -24,8 +24,12 @@
#include "backupfile.h"
#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
#include <string.h>
+#ifndef index
#define index strchr
+#endif
+#ifndef rindex
#define rindex strrchr
+#endif
#else
#include <strings.h>
#endif
diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 50eb10e28..48c31dd34 100644
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,3 +1,29 @@
+Mon Apr 19 11:21:14 1993 Jim Meyering (meyering@comco.com)
+
+ * Version 3.5.
+
+ * ls.c, touch.c: Don't include time.h explicitly -- it's included
+ by system.h. From Franc,ois Pinard.
+
+ * posixtm.y: Use TM_IN_SYS_TIME.
+
+ * backupfile.c [index, rindex]: Don't redefine them.
+
+ * system.h [alloca]: Don't redefine it.
+
+ * configure.in: Check for sys/time.h; getdate.y needs it for
+ structs timeval and timezone on some systems.
+
+Sun Apr 18 22:40:19 1993 David J. MacKenzie (djm@kropotkin.gnu.ai.mit.edu)
+
+ * ls.c: Include fnmatch.h after system.h, so we get our
+ definitions of FNM_*, not those from unistd.h.
+
+ * mountlist.c [MOUNTED_GETMNTINFO]: Add #ifdef around MOUNT_PC.
+
+ * configure.in: Fix test for 4.4BSD statfs to not grep for a
+ macro in cpp output.
+
Sun Apr 18 02:35:36 1993 Jim Meyering (meyering@comco.com)
* configure.in: Check for gettimeofday.
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
diff --git a/src/touch.c b/src/touch.c
index 9a8ca5841..efb45a1f6 100644
--- a/src/touch.c
+++ b/src/touch.c
@@ -39,9 +39,7 @@
#include "system.h"
#include "version.h"
-#ifdef STDC_HEADERS
-#include <time.h>
-#else
+#ifndef STDC_HEADERS
time_t mktime ();
time_t time ();
#endif