HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(last_event_timestamp): Declare, but don't define.
[bpt/emacs.git]
/
src
/
systty.h
diff --git
a/src/systty.h
b/src/systty.h
index
2ef4d0e
..
d9376fa
100644
(file)
--- a/
src/systty.h
+++ b/
src/systty.h
@@
-1,11
+1,11
@@
/* systty.h - System-dependent definitions for terminals.
/* systty.h - System-dependent definitions for terminals.
- Copyright (C) 1993 Free Software Foundation, Inc.
+ Copyright (C) 1993
, 1994
Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version
1
, or (at your option)
+the Free Software Foundation; either version
2
, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
any later version.
GNU Emacs is distributed in the hope that it will be useful,
@@
-15,7
+15,8
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
#ifdef HAVE_TERMIOS
#define HAVE_TCATTR
#ifdef HAVE_TERMIOS
#define HAVE_TCATTR
@@
-72,9
+73,9
@@
the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <fcntl.h>
#else /* neither HAVE_TERMIO nor HAVE_TERMIOS */
#ifndef VMS
#include <fcntl.h>
#else /* neither HAVE_TERMIO nor HAVE_TERMIOS */
#ifndef VMS
-#ifndef
MSDOS
+#ifndef
DOS_NT
#include <sgtty.h>
#include <sgtty.h>
-#endif
+#endif
/* not DOS_NT */
#else /* VMS */
#include <descrip.h>
static struct iosb
#else /* VMS */
#include <descrip.h>
static struct iosb
@@
-114,7
+115,12
@@
static struct sensemode {
#endif /* not HAVE_TERMIOS */
#endif /* not HAVE_TERMIO */
#endif /* not HAVE_TERMIOS */
#endif /* not HAVE_TERMIO */
-#ifdef AIX
+#ifdef __GNU_LIBRARY__
+#include <sys/ioctl.h>
+#include <termios.h>
+#endif
+
+#ifdef AIXHFT
/* Get files for keyboard remapping */
#define HFNKEYS 2
#include <sys/hft.h>
/* Get files for keyboard remapping */
#define HFNKEYS 2
#include <sys/hft.h>
@@
-134,22
+140,13
@@
static struct sensemode {
#if defined (HPUX) && defined (HAVE_PTYS)
#include <sys/ptyio.h>
#endif
#if defined (HPUX) && defined (HAVE_PTYS)
#include <sys/ptyio.h>
#endif
-
+
#ifdef AIX
#include <sys/pty.h>
#ifdef AIX
#include <sys/pty.h>
-#include <unistd.h>
-#define UNISTD_H_INCLUDED
#endif /* AIX */
#endif /* AIX */
-#ifdef IRIX4
-/* Get _getpty prototype */
-#include <unistd.h>
-#define UNISTD_H_INCLUDED
-#endif
-
-#if defined (POSIX) && !defined (UNISTD_H_INCLUDED) && defined (HAVE_UNISTD_H)
+#if (defined (POSIX) || defined (NEED_UNISTD_H)) && defined (HAVE_UNISTD_H)
#include <unistd.h>
#include <unistd.h>
-#define UNISTD_H_INCLUDED
#endif
#ifdef SYSV_PTYS
#endif
#ifdef SYSV_PTYS
@@
-295,13
+292,18
@@
static struct sensemode {
#endif
#endif
-/* EMACS_GETPGRP (arg) returns the process group of the
terminal
. */
+/* EMACS_GETPGRP (arg) returns the process group of the
process
. */
+#ifdef __GNU_LIBRARY__
+/* GNU libc by default defines getpgrp with no args on all systems. */
+#define GETPGRP_NO_ARG
+#else /* not __GNU_LIBRARY__ */
#if defined (USG) && !defined (GETPGRP_NEEDS_ARG)
# if !defined (GETPGRP_NO_ARG)
# define GETPGRP_NO_ARG
# endif
#endif
#if defined (USG) && !defined (GETPGRP_NEEDS_ARG)
# if !defined (GETPGRP_NO_ARG)
# define GETPGRP_NO_ARG
# endif
#endif
+#endif /* not __GNU_LIBRARY__ */
#if defined (GETPGRP_NO_ARG)
# define EMACS_GETPGRP(x) getpgrp()
#if defined (GETPGRP_NO_ARG)
# define EMACS_GETPGRP(x) getpgrp()
@@
-322,11
+324,10
@@
static struct sensemode {
of the tty on FD in *P. Return zero if all's well, or -1 if we ran
into an error we couldn't deal with.
of the tty on FD in *P. Return zero if all's well, or -1 if we ran
into an error we couldn't deal with.
- EMACS_SET_TTY (int FD, struct emacs_tty *P, int
wait
p)
+ EMACS_SET_TTY (int FD, struct emacs_tty *P, int
flush
p)
sets the parameters of the tty on FD according to the contents of
sets the parameters of the tty on FD according to the contents of
- *P. If waitp is non-zero, we wait for all queued output to be
- written before making the change; otherwise, we forget any queued
- input and make the change immediately.
+ *P. If flushp is non-zero, we discard queued input to be
+ written before making the change.
Return 0 if all went well, and -1 if anything failed.
EMACS_TTY_TABS_OK (struct emacs_tty *P) is false iff the kernel
Return 0 if all went well, and -1 if anything failed.
EMACS_TTY_TABS_OK (struct emacs_tty *P) is false iff the kernel
@@
-352,11
+353,11
@@
struct emacs_tty {
#ifdef VMS
struct sensemode main;
#else
#ifdef VMS
struct sensemode main;
#else
-#ifdef
MSDOS
+#ifdef
DOS_NT
int main;
int main;
-#else
+#else
/* not DOS_NT */
struct sgttyb main;
struct sgttyb main;
-#endif
+#endif
/* not DOS_NT */
#endif
#endif
#endif
#endif
#endif
#endif
@@
-407,11
+408,11
@@
struct emacs_tty {
#else
#else
-#ifdef
MSDOS
+#ifdef
DOS_NT
#define EMACS_TTY_TABS_OK(p) 0
#define EMACS_TTY_TABS_OK(p) 0
-#else /* not
MSDOS
*/
+#else /* not
DOS_NT
*/
#define EMACS_TTY_TABS_OK(p) (((p)->main.sg_flags & XTABS) != XTABS)
#define EMACS_TTY_TABS_OK(p) (((p)->main.sg_flags & XTABS) != XTABS)
-#endif /* not
MSDOS
*/
+#endif /* not
DOS_NT
*/
#endif /* not def VMS */
#endif /* not def HAVE_TERMIO */
#endif /* not def VMS */
#endif /* not def HAVE_TERMIO */