Contents in 1999-06-04-13 of release-21-2.

[chise/xemacs-chise.git.1] / src / console-tty.h

diff --git a/src/console-tty.h b/src/console-tty.h
index 5c521ad..bc5aacd 100644 (file)
--- a/src/console-tty.h
+++ b/src/console-tty.h
@@ -220,21 +220,17 @@ struct tty_console
 #define TTY_FLAGS(c) (CONSOLE_TTY_DATA (c)->flags)
 #define TTY_COST(c) (CONSOLE_TTY_DATA (c)->cost)
 
-#define TTY_INC_CURSOR_X(c, n)                                         \
-do                                                                     \
-{                                                                      \
-  int __tempn__ = (n);                                                 \
+#define TTY_INC_CURSOR_X(c, n) do {                                    \
+  int TICX_n = (n);                                                    \
   assert (CONSOLE_TTY_CURSOR_X (c) == CONSOLE_TTY_REAL_CURSOR_X (c));  \
-  CONSOLE_TTY_CURSOR_X (c) += __tempn__;                               \
-  CONSOLE_TTY_REAL_CURSOR_X (c) += __tempn__;                          \
+  CONSOLE_TTY_CURSOR_X (c) += TICX_n;                                  \
+  CONSOLE_TTY_REAL_CURSOR_X (c) += TICX_n;                             \
 } while (0)
 
-#define TTY_INC_CURSOR_Y(c, n)                 \
-do                                             \
-{                                              \
-  int __tempn__ = (n);                         \
-  CONSOLE_TTY_CURSOR_Y (c) += __tempn__;       \
-  CONSOLE_TTY_REAL_CURSOR_Y (c) += __tempn__;  \
+#define TTY_INC_CURSOR_Y(c, n) do {            \
+  int TICY_n = (n);                            \
+  CONSOLE_TTY_CURSOR_Y (c) += TICY_n;          \
+  CONSOLE_TTY_REAL_CURSOR_Y (c) += TICY_n;     \
 } while (0)
 
 struct tty_device
@@ -297,5 +293,6 @@ Lisp_Object tty_semi_canonicalize_device_connection (Lisp_Object connection,
                                                     Error_behavior errb);
 Lisp_Object tty_canonicalize_device_connection (Lisp_Object connection,
                                                Error_behavior errb);
+struct console * tty_find_console_from_fd (int fd);
 
 #endif /* _XEMACS_CONSOLE_TTY_H_ */