Mercurial > emacs
changeset 108908:734073f5d073
Remove INCLUDED_FCNTL.
* xterm.c (INCLUDED_FCNTL):
* callproc.c (INCLUDED_FCNTL):
* alloc.c (INCLUDED_FCNTL):
* systty.h (INCLUDED_FCNTL): Remove all uses, not needed anymore.
(emacs_get_tty, emacs_set_tty): Declare unconditionally.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 07 Jun 2010 20:02:41 -0700 |
| parents | 38cf1b719b59 |
| children | 8cdd65a4d95c |
| files | src/ChangeLog src/alloc.c src/callproc.c src/systty.h src/xterm.c |
| diffstat | 5 files changed, 11 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jun 07 19:29:12 2010 -0700 +++ b/src/ChangeLog Mon Jun 07 20:02:41 2010 -0700 @@ -1,3 +1,12 @@ +2010-06-08 Dan Nicolaescu <dann@ics.uci.edu> + + Remove INCLUDED_FCNTL. + * xterm.c (INCLUDED_FCNTL): + * callproc.c (INCLUDED_FCNTL): + * alloc.c (INCLUDED_FCNTL): + * systty.h (INCLUDED_FCNTL): Remove all uses, not needed anymore. + (emacs_get_tty, emacs_set_tty): Declare unconditionally. + 2010-06-07 Martin Rudalics <rudalics@gmx.at> * window.c (Fselect_window): Move `record_buffer' up to the
--- a/src/alloc.c Mon Jun 07 19:29:12 2010 -0700 +++ b/src/alloc.c Mon Jun 07 20:02:41 2010 -0700 @@ -70,7 +70,6 @@ #endif #ifdef HAVE_FCNTL_H -#define INCLUDED_FCNTL #include <fcntl.h> #endif #ifndef O_WRONLY
--- a/src/callproc.c Mon Jun 07 19:29:12 2010 -0700 +++ b/src/callproc.c Mon Jun 07 20:02:41 2010 -0700 @@ -39,7 +39,6 @@ #include <sys/file.h> #ifdef HAVE_FCNTL_H -#define INCLUDED_FCNTL #include <fcntl.h> #endif @@ -53,7 +52,6 @@ #endif #ifdef MSDOS /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */ -#define INCLUDED_FCNTL #include <fcntl.h> #include <sys/stat.h> #include <sys/param.h>
--- a/src/systty.h Mon Jun 07 19:29:12 2010 -0700 +++ b/src/systty.h Mon Jun 07 20:02:41 2010 -0700 @@ -27,17 +27,13 @@ #ifndef NO_TERMIO #include <termio.h> #endif /* not NO_TERMIO */ -#ifndef INCLUDED_FCNTL -#define INCLUDED_FCNTL #include <fcntl.h> -#endif #else /* not HAVE_TERMIO */ #ifdef HAVE_TERMIOS #ifndef NO_TERMIO #include <termio.h> #endif #include <termios.h> -#define INCLUDED_FCNTL #include <fcntl.h> #else /* neither HAVE_TERMIO nor HAVE_TERMIOS */ #ifndef DOS_NT @@ -247,10 +243,8 @@ expression, so we moved them out to their own functions in sysdep.c. */ #define EMACS_GET_TTY(fd, p) (emacs_get_tty ((fd), (p))) #define EMACS_SET_TTY(fd, p, waitp) (emacs_set_tty ((fd), (p), (waitp))) -#ifdef P_ /* Unfortunately this file is sometimes included before lisp.h */ -extern int emacs_get_tty P_ ((int, struct emacs_tty *)); -extern int emacs_set_tty P_ ((int, struct emacs_tty *, int)); -#endif +extern int emacs_get_tty (int, struct emacs_tty *); +extern int emacs_set_tty (int, struct emacs_tty *, int); /* Define EMACS_TTY_TABS_OK. */