Mercurial > hg > octave-kai > gnulib-hg
changeset 353:d0ffaead1f4f
merge with 1.12
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Sun, 06 Nov 1994 17:51:31 +0000 |
parents | e119995bcdc8 |
children | 1a1518a6e639 |
files | lib/Makefile.in lib/makepath.c lib/obstack.h |
diffstat | 3 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -48,7 +48,7 @@ @LIBOBJS@ @ALLOCA@ DISTFILES = Makefile.in backupfile.h getopt.h long-options.h modechange.h \ -fnmatch.h fsusage.h makepath.h mountlist.h obstack.h pathmax.h \ +fnmatch.h fsusage.h group-member.h makepath.h mountlist.h obstack.h pathmax.h \ safe-xstat.cin safe-xstat.hin getdate.c posixtm.c $(SOURCES) all: libfu.a @@ -153,6 +153,8 @@ xgetcwd.o: pathmax.h euidaccess.o fsusage.o isdir.o makepath.o mkdir.o rename.o: safe-stat.h makepath.o: makepath.h +obstack.o: obstack.h +group-member.o: group-member.h # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.
--- a/lib/makepath.c +++ b/lib/makepath.c @@ -99,6 +99,16 @@ Return 0 if ARGPATH exists as a directory with the proper ownership and permissions when done, otherwise 1. */ +#if defined (__GNUC__) || (defined (__STDC__) && __STDC__) +int +make_path (const char *argpath, + int mode, + int parent_mode, + uid_t owner, + gid_t group, + int preserve_existing, + const char *verbose_fmt_string) +#else int make_path (argpath, mode, parent_mode, owner, group, preserve_existing, verbose_fmt_string) @@ -109,6 +119,7 @@ gid_t group; int preserve_existing; const char *verbose_fmt_string; +#endif { char *dirpath; /* A copy we can scribble NULs on. */ struct stat stats;
--- a/lib/obstack.h +++ b/lib/obstack.h @@ -272,7 +272,7 @@ /* 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 || (NeXt && !__GNUC_MINOR__) +#if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__) #define __extension__ #endif