X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fsystty.h;h=67015e8174dc01744ff60565d38f51153fcabf7e;hb=4f29597e4f3696a59bb08ffece07183c1568c4a5;hp=bceec586c8027c14082d350854baa33419cabc27;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git-

diff --git a/src/systty.h b/src/systty.h
index bceec58..67015e8 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -20,8 +20,8 @@ Boston, MA 02111-1307, USA.  */
 
 /* Synched up with: FSF 19.30. */
 
-#ifndef _XEMACS_SYSTTY_H_
-#define _XEMACS_SYSTTY_H_
+#ifndef INCLUDED_systty_h_
+#define INCLUDED_systty_h_
 
 #ifdef HAVE_TERMIOS
 # define HAVE_TCATTR
@@ -53,6 +53,10 @@ Boston, MA 02111-1307, USA.  */
 
 /* Include the proper files.  */
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 /* XEmacs: TERMIOS is mo' better than TERMIO so we use it if it's
    there.  Since TERMIO is backward-compatibility stuff if both it
    and TERMIOS exist, it's more likely to be broken. */
@@ -177,10 +181,6 @@ Boston, MA 02111-1307, USA.  */
 /* ----------------------------------------------------- */
 
 
-#ifdef APOLLO
-#undef TIOCSTART
-#endif
-
 #if defined (XENIX) || defined (BROKEN_TIOCGETC)
 #undef TIOCGETC  /* Avoid confusing some conditionals that test this.  */
 #endif
@@ -193,10 +193,6 @@ Boston, MA 02111-1307, USA.  */
 #undef TIOCSWINSZ
 #endif
 
-#ifdef BROKEN_O_NONBLOCK /* XEmacs addition */
-# undef O_NONBLOCK
-#endif /* BROKEN_O_NONBLOCK */
-
 /* On TERMIOS systems, the tcmumbleattr calls take care of these
    parameters, and it's a bad idea to use them (on AIX, it makes the
    tty hang for a long time).  */
@@ -214,19 +210,16 @@ Boston, MA 02111-1307, USA.  */
 /* ----------------------------------------------------- */
 
 /* Try to establish the correct character to disable terminal functions
-   in a system-independent manner.  Note that USG (at least) define
-   _POSIX_VDISABLE as 0!  */
-
-#ifdef _POSIX_VDISABLE
-#define CDISABLE _POSIX_VDISABLE
-#else /* not _POSIX_VDISABLE */
-#ifdef CDEL
-#undef CDISABLE
-#define CDISABLE CDEL
-#else /* not CDEL */
-#define CDISABLE 255
-#endif /* not CDEL */
-#endif /* not _POSIX_VDISABLE */
+   in a system-independent manner.
+   We use the POSIX standard way to do this, and emulate on other systems. */
+
+#ifndef _POSIX_VDISABLE
+# if defined CDEL
+#  define _POSIX_VDISABLE CDEL
+# else
+#  define _POSIX_VDISABLE 255
+# endif
+#endif /* ! _POSIX_VDISABLE */
 
 
 /* ----------------------------------------------------- */
@@ -340,6 +333,8 @@ Boston, MA 02111-1307, USA.  */
    No big loss -- it just means that ^Z won't work right
    if we're run from sh. */
 #  define EMACS_SET_PROCESS_GROUP(pg)
+#elif defined(__MINGW32__)
+#  define EMACS_SEPARATE_PROCESS_GROUP()
 #else
 /* Under NeXTstep, a process group of 0 is not the same as specifying
    your own process ID, so we go ahead and specify it explicitly. */
@@ -359,11 +354,11 @@ Boston, MA 02111-1307, USA.  */
    emacs_tty should contain an element for each parameter struct
    that Emacs may change.
 
-   EMACS_GET_TTY (int FD, struct emacs_tty *P) stores the parameters
+   emacs_get_tty (int FD, struct emacs_tty *P) stores the parameters
    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 flushp)
+   emacs_set_tty (int FD, struct emacs_tty *P, int flushp)
    sets the parameters of the tty on FD according to the contents of
    *P.  If flushp is non-zero, we discard queued input to be
    written before making the change.
@@ -410,15 +405,9 @@ struct emacs_tty {
 #endif /* HAVE_TCHARS */
 #endif /* HAVE_TERMIOS */
 };
-
-/* Define EMACS_GET_TTY and EMACS_SET_TTY,
-   the macros for reading and setting parts of `struct emacs_tty'.
 
-   These got pretty unmanageable (huge macros are hard to debug), and
-   finally needed some code which couldn't be done as part of an
-   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)
+int emacs_get_tty (int fd, struct emacs_tty *settings);
+int emacs_set_tty (int fd, struct emacs_tty *settings, int flushp);
 
 
 /* --------------------------------------------------------- */
@@ -448,4 +437,4 @@ struct emacs_tty {
 #endif /* not def HAVE_TERMIO */
 #endif /* not def HAVE_TERMIOS */
 
-#endif /* _XEMACS_SYSTTY_H_ */
+#endif /* INCLUDED_systty_h_ */