summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1994-11-04 16:50:04 +0000
committerJim Meyering <jim@meyering.net>1994-11-04 16:50:04 +0000
commitfad3ef71a45303c04ee7cf096db58c93672d2bca (patch)
tree9014913bdc59ec3b643bce5dd034ec7e6d78e557
parentc21a3a4ec6dcc7b65f7029974ce76884bbd6721b (diff)
downloadcoreutils-fad3ef71a45303c04ee7cf096db58c93672d2bca.tar.xz
merge with 3.9u1
-rw-r--r--lib/obstack.h15
-rw-r--r--old/fileutils/ChangeLog26
2 files changed, 35 insertions, 6 deletions
diff --git a/lib/obstack.h b/lib/obstack.h
index 01767195d..840a63baa 100644
--- a/lib/obstack.h
+++ b/lib/obstack.h
@@ -119,7 +119,7 @@ Summary:
but in traditional C it is usually long. If we are in ANSI C and
don't already have ptrdiff_t get it. */
-#if defined (__STDC__) && ! defined (offsetof)
+#if defined (__STDC__) && __STDC__ && ! defined (offsetof)
#if defined (__GNUC__) && defined (IN_GCC)
/* On Next machine, the system's stddef.h screws up if included
after we have defined just ptrdiff_t, so include all of stddef.h.
@@ -132,7 +132,7 @@ Summary:
#include <stddef.h>
#endif
-#ifdef __STDC__
+#if defined (__STDC__) && __STDC__
#define PTR_INT_TYPE ptrdiff_t
#else
#define PTR_INT_TYPE long
@@ -167,7 +167,7 @@ struct obstack /* control current object in current chunk */
/* Declare the external functions we use; they are in obstack.c. */
-#ifdef __STDC__
+#if defined (__STDC__) && __STDC__
extern void _obstack_newchunk (struct obstack *, int);
extern void _obstack_free (struct obstack *, void *);
extern int _obstack_begin (struct obstack *, int, int,
@@ -181,7 +181,7 @@ extern int _obstack_begin ();
extern int _obstack_begin_1 ();
#endif
-#ifdef __STDC__
+#if defined (__STDC__) && __STDC__
/* Do the function-declarations after the structs
but before defining the macros. */
@@ -269,7 +269,10 @@ int obstack_chunk_size (struct obstack *obstack);
#define obstack_blank_fast(h,n) ((h)->next_free += (n))
#if defined (__GNUC__) && defined (__STDC__)
-#if __GNUC__ < 2
+/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
+ does not implement __extension__. But that compiler doesn't define
+ __GNUC_MINOR__. */
+#if __GNUC__ < 2 || !__GNUC_MINOR__
#define __extension__
#endif
@@ -492,7 +495,7 @@ __extension__ \
(h)->object_base = (h)->next_free, \
__INT_TO_PTR ((h)->temp)))
-#ifdef __STDC__
+#if defined (__STDC__) && __STDC__
#define obstack_free(h,obj) \
( (h)->temp = (char *)(obj) - (char *) (h)->chunk, \
(((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
diff --git a/old/fileutils/ChangeLog b/old/fileutils/ChangeLog
index 8ec770da3..8cefc672e 100644
--- a/old/fileutils/ChangeLog
+++ b/old/fileutils/ChangeLog
@@ -1,3 +1,29 @@
+Thu Nov 03 12:59:34 1994 Jim Meyering (meyering@comco.com)
+
+ * makepath.h: New file.
+ * makepath.c: Include it.
+ Add an argument: PRESERVE_EXISTING.
+ Declare char* arguments const.
+ * install.c, mkdir.c: Update callers. Set it in mkdir.c so
+ that `mkdir -p' ignores existing directories as POSIX mandates.
+ Before, it would try to change owner and/or permissions of such
+ directories. Christopher S. Arthur <csa@halcyon.com> reported
+ the mkdir -p failure.
+ * lib/Makefile.in (DISTFILES): Add it.
+ (makepath.o): Depend on makepath.h.
+ * src/Makefile.in (install.o, mkdir.o): Depend on makepath.h.
+ * cp.c (make_path_private): Rename function from make_path to
+ avoid confusion.
+ (do_copy): Update caller.
+
+ * ls.c: Include <limits.h> before system.h because limits.h on
+ some systems undefines PATH_MAX, whereas system.h includes pathmax.h
+ which sets PATH_MAX. From Kaveh Ghazi.
+
+ * euidaccess.c: Define S_IXUSR, S_IXGRP, and S_IXOTH in terms of
+ S_IEXEC if they're not already defined. Reported by Kaveh Ghazi
+ and Daniel Hagerty <hag@gnu.ai.mit.edu>.
+
Tue Nov 01 06:18:20 1994 Jim Meyering (meyering@comco.com)
* eaccess.c (euidaccess): Rename from eaccess to avoid conflict