diff options
| author | Jim Meyering <jim@meyering.net> | 1994-11-06 17:51:23 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1994-11-06 17:51:23 +0000 |
| commit | 4c722a96ba32e2a32fad410cd7047acba4e880db (patch) | |
| tree | 0ad884bbad909297f3df45fecdffad7d4206305d /lib | |
| parent | c67fdb5c94a76a9ef3e6bbbbd8d31e8deac1c6e8 (diff) | |
| download | coreutils-4c722a96ba32e2a32fad410cd7047acba4e880db.tar.xz | |
merge with 1.12
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.in | 4 | ||||
| -rw-r--r-- | lib/makepath.c | 11 | ||||
| -rw-r--r-- | lib/obstack.h | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in index bca5e5636..c1ba84d49 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -48,7 +48,7 @@ stripslash.o xgetcwd.o xmalloc.o xstrdup.o userspec.o yesno.o \ @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 @@ mountlist.o: mountlist.h 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. diff --git a/lib/makepath.c b/lib/makepath.c index 9066874cd..b59211672 100644 --- a/lib/makepath.c +++ b/lib/makepath.c @@ -99,6 +99,16 @@ void error (); 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 @@ make_path (argpath, mode, parent_mode, owner, group, preserve_existing, gid_t group; int preserve_existing; const char *verbose_fmt_string; +#endif { char *dirpath; /* A copy we can scribble NULs on. */ struct stat stats; diff --git a/lib/obstack.h b/lib/obstack.h index 2f5ec61ae..1f0b5269b 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -272,7 +272,7 @@ int obstack_chunk_size (struct obstack *obstack); /* 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 |