diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-28 23:05:13 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-08-28 23:05:13 +0000 |
| commit | 023c88aaa0c53038459a8f493ca98de558d31cb7 (patch) | |
| tree | e96135b586b41a40286893be5febfa86dd286612 | |
| parent | a66840f18dbdd1e1852929a4b58c8bebee10d685 (diff) | |
| download | coreutils-023c88aaa0c53038459a8f493ca98de558d31cb7.tar.xz | |
Adjust to recent gnulib changes for the gnulib module.
* bootstrap.conf (gnulib_modules): Add fcntl.
* src/system.h (SEEK_SET, SEEK_CUR, SEEK_END): Remove. Other code
is already assuming these macros are defined.
(O_DIRECT, O_DIRECTORY, O_DSYNC, O_NDELAY, O_NOATIME, O_NONBLOCK):
(O_NOCTTY, O_NOFOLLOW, O_NOLINKS, O_RSYNC, O_SYNC, O_BINARY, O_TEXT):
Remove; the fcntl module now handles these.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | bootstrap.conf | 2 | ||||
| -rw-r--r-- | src/system.h | 73 |
3 files changed, 10 insertions, 74 deletions
@@ -1,8 +1,17 @@ 2006-08-28 Paul Eggert <eggert@cs.ucla.edu> + Adjust to recent gnulib changes for the gnulib module. + * bootstrap.conf (gnulib_modules): Add fcntl. + * src/system.h (SEEK_SET, SEEK_CUR, SEEK_END): Remove. Other code + is already assuming these macros are defined. + (O_DIRECT, O_DIRECTORY, O_DSYNC, O_NDELAY, O_NOATIME, O_NONBLOCK): + (O_NOCTTY, O_NOFOLLOW, O_NOLINKS, O_RSYNC, O_SYNC, O_BINARY, O_TEXT): + Remove; the fcntl module now handles these. + Adjust to recent gnulib changes for the inttypes module. * bootstrap.conf (gnulib_modules): Remove stdint; add inttypes. (excluded_files): Don't exclude m4/inttypes-h.m4 or m4/inttypes-pri.m4. + * src/system.h: Don't bother to include <stdint.h>, since we can now assume inttypes.h does the equivalent of including stdint.h. diff --git a/bootstrap.conf b/bootstrap.conf index 173d9b1fc..48e5d047b 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -41,7 +41,7 @@ gnulib_modules=" c-strtold calloc canon-host canonicalize chown cloexec config-h configmake closeout cycle-check d-ino d-type diacrit dirfd dirname dup2 - error euidaccess exclude exitfail fcntl-safer fdl file-type + error euidaccess exclude exitfail fcntl fcntl-safer fdl file-type fileblocks filemode filenamecat fnmatch-gnu fopen-safer fprintftime fsusage ftruncate fts getdate getgroups gethrxtime getline getloadavg getndelim2 getopt getpagesize getpass-gnu diff --git a/src/system.h b/src/system.h index 8901bb5ad..73a0fef47 100644 --- a/src/system.h +++ b/src/system.h @@ -152,11 +152,6 @@ initialize_exit_failure (int status) #include <fcntl.h> -#if !defined SEEK_SET -# define SEEK_SET 0 -# define SEEK_CUR 1 -# define SEEK_END 2 -#endif #ifndef F_OK # define F_OK 0 # define X_OK 1 @@ -164,74 +159,6 @@ initialize_exit_failure (int status) # define R_OK 4 #endif -#if !defined O_DIRECT && defined O_DIRECTIO -/* Tru64 spells it `O_DIRECTIO'. */ -# define O_DIRECT O_DIRECTIO -#endif - -#if !defined O_DIRECT -# define O_DIRECT 0 -#endif - -#if !defined O_DIRECTORY -# define O_DIRECTORY 0 -#endif - -#if !defined O_DSYNC -# define O_DSYNC 0 -#endif - -#if !defined O_NDELAY -# define O_NDELAY 0 -#endif - -#if !defined O_NOATIME -# define O_NOATIME 0 -#endif - -#if !defined O_NONBLOCK -# define O_NONBLOCK O_NDELAY -#endif - -#if !defined O_NOCTTY -# define O_NOCTTY 0 -#endif - -#if !defined O_NOFOLLOW -# define O_NOFOLLOW 0 -#endif - -#if !defined O_NOLINKS -# define O_NOLINKS 0 -#endif - -#if !defined O_RSYNC -# define O_RSYNC 0 -#endif - -#if !defined O_SYNC -# define O_SYNC 0 -#endif - -/* For systems that distinguish between text and binary I/O. - O_BINARY is usually declared in fcntl.h */ -#if !defined O_BINARY && defined _O_BINARY - /* For MSC-compatible compilers. */ -# define O_BINARY _O_BINARY -# define O_TEXT _O_TEXT -#endif - -#ifdef __BEOS__ - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ -# undef O_BINARY -# undef O_TEXT -#endif - -#ifndef O_BINARY -# define O_BINARY 0 -# define O_TEXT 0 -#endif - #include <dirent.h> #ifndef _D_EXACT_NAMLEN # define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name) |