diff options
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/minibuf.c | 4 | ||||
| -rw-r--r-- | src/sysdep.c | 3 | ||||
| -rw-r--r-- | src/systty.h | 4 |
4 files changed, 12 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2838d3f692a..9265051e311 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +2014-07-11 Paul Eggert <eggert@cs.ucla.edu> + + Coalesce extern decls. + * minibuf.c (emacs_get_tty, emacs_set_tty, suppress_echo_on_tty): + * sysdep.c (emacs_get_tty, emacs_set_tty): + Move duplicate extern decls from here ... + * systty.h: ... to here, so that there's just one copy. + 2014-07-11 Jan Djärv <jan.h.d@swipnet.se> * nsterm.m (changeFont:): Add ifdef NS_IMPL_COCOA. diff --git a/src/minibuf.c b/src/minibuf.c index 5b6c9154621..1f2fb1fdf3f 100644 --- a/src/minibuf.c +++ b/src/minibuf.c @@ -38,11 +38,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "intervals.h" #include "keymap.h" #include "termhooks.h" - #include "systty.h" -extern void emacs_get_tty (int, struct emacs_tty *); -extern int emacs_set_tty (int, struct emacs_tty *, bool); -extern void suppress_echo_on_tty (int); /* List of buffers for use as minibuffers. The first element of the list is used for the outermost minibuffer diff --git a/src/sysdep.c b/src/sysdep.c index c5b3c43ea6d..eae15ea1ec3 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -105,9 +105,6 @@ int _cdecl _getpid (void); #include "syssignal.h" #include "systime.h" -void emacs_get_tty (int, struct emacs_tty *) EXTERNALLY_VISIBLE; -int emacs_set_tty (int, struct emacs_tty *, bool) EXTERNALLY_VISIBLE; - /* ULLONG_MAX is missing on Red Hat Linux 7.3; see Bug#11781. */ #ifndef ULLONG_MAX #define ULLONG_MAX TYPE_MAXIMUM (unsigned long long int) diff --git a/src/systty.h b/src/systty.h index dd4c07d32d9..dcab0268393 100644 --- a/src/systty.h +++ b/src/systty.h @@ -23,6 +23,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <fcntl.h> #endif /* not DOS_NT */ +#include <stdbool.h> #include <sys/ioctl.h> #ifdef HPUX @@ -79,5 +80,8 @@ struct emacs_tty { }; /* From sysdep.c or w32.c */ +extern void emacs_get_tty (int, struct emacs_tty *) EXTERNALLY_VISIBLE; +extern int emacs_set_tty (int, struct emacs_tty *, bool) EXTERNALLY_VISIBLE; +extern void suppress_echo_on_tty (int); extern int serial_open (Lisp_Object); extern void serial_configure (struct Lisp_Process *, Lisp_Object); |