X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fconsole-tty.h;h=bc5aacdfb18af03b4a9c80f625584fe742782a52;hb=4082f470d7c6075a5c04c1bdf6e9e3f27c9700d5;hp=5c521add629454e98212a921016b6fb2f1e75373;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git-

diff --git a/src/console-tty.h b/src/console-tty.h
index 5c521ad..bc5aacd 100644
--- 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_ */