diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2000-09-01 13:50:50 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2000-09-01 13:50:50 +0000 |
| commit | f72adc12d5669d5cc64ff6539dc36e74afefb79d (patch) | |
| tree | f280aa91baf5f2ee89118e3092e30992e5dcfb93 /lib-src | |
| parent | 38404229887345de92c7ab0da85a5d0f7aaaf585 (diff) | |
| download | emacs-f72adc12d5669d5cc64ff6539dc36e74afefb79d.tar.gz | |
(toplevel): Remove redundant <fcntl.h>. Provide definitions for F_OK
and friends only after including both fcntl.h and unistd.h: some
systems define them on unistd.h.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/movemail.c | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 4baa7cd7ff4..890d3a77370 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2000-09-01 Eli Zaretskii <eliz@is.elta.co.il> + + * movemail.c (toplevel): Remove redundant fcnt.h. + [!F_OK]: Provide default definitions only after including both + fcntl.h and unistd.h. + 2000-08-29 Eli Zaretskii <eliz@is.elta.co.il> * Makefile.in (profile, make-docfile, hexl): Depend on config.h. diff --git a/lib-src/movemail.c b/lib-src/movemail.c index d37644063e1..cfe817c1119 100644 --- a/lib-src/movemail.c +++ b/lib-src/movemail.c @@ -62,11 +62,14 @@ Boston, MA 02111-1307, USA. */ #include <stdio.h> #include <errno.h> -#include "syswait.h" #include <getopt.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif +#include "syswait.h" #ifdef MAIL_USE_POP #include "pop.h" #endif @@ -102,9 +105,6 @@ Boston, MA 02111-1307, USA. */ #include <fcntl.h> #endif /* WINDOWSNT */ -#ifdef HAVE_FCNTL_H -#include <fcntl.h> -#endif #ifndef F_OK #define F_OK 0 #define X_OK 1 @@ -112,10 +112,6 @@ Boston, MA 02111-1307, USA. */ #define R_OK 4 #endif -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - #if defined (XENIX) || defined (WINDOWSNT) #include <sys/locking.h> #endif |