Mercurial > hg > xemacs-beta
diff src/console.h @ 213:78f53ef88e17 r20-4b5
Import from CVS: tag r20-4b5
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 10:06:47 +0200 |
| parents | 41ff10fd062f |
| children | 1f0dabaa0855 |
line wrap: on
line diff
--- a/src/console.h Mon Aug 13 10:05:53 2007 +0200 +++ b/src/console.h Mon Aug 13 10:06:47 2007 +0200 @@ -439,15 +439,15 @@ #else #define CONSOLE_TYPESYM_TTY_P(typesym) 0 #endif -#ifdef HAVE_W32GUI -#define CONSOLE_TYPESYM_W32_P(typesym) EQ (typesym, Qw32) +#ifdef HAVE_MS_WINDOWS +#define CONSOLE_TYPESYM_MSWINDOWS_P(typesym) EQ (typesym, Qmswindows) #else -#define CONSOLE_TYPESYM_W32_P(typesym) 0 +#define CONSOLE_TYPESYM_MSWINDOWS_P(typesym) 0 #endif #define CONSOLE_TYPESYM_STREAM_P(typesym) EQ (typesym, Qstream) #define CONSOLE_TYPESYM_WIN_P(typesym) \ - (CONSOLE_TYPESYM_X_P (typesym)) + (CONSOLE_TYPESYM_X_P (typesym) || CONSOLE_TYPESYM_MSWINDOWS_P (typesym)) #define CONSOLE_X_P(con) CONSOLE_TYPESYM_X_P (CONSOLE_TYPE (con)) #define CHECK_X_CONSOLE(z) CHECK_CONSOLE_TYPE (z, x) @@ -457,9 +457,9 @@ #define CHECK_TTY_CONSOLE(z) CHECK_CONSOLE_TYPE (z, tty) #define CONCHECK_TTY_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, tty) -#define CONSOLE_W32_P(con) CONSOLE_TYPESYM_W32_P (CONSOLE_TYPE (con)) -#define CHECK_W32_CONSOLE(z) CHECK_CONSOLE_TYPE (z, w32) -#define CONCHECK_W32_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, w32) +#define CONSOLE_MSWINDOWS_P(con) CONSOLE_TYPESYM_MSWINDOWS_P (CONSOLE_TYPE (con)) +#define CHECK_MSWINDOWS_CONSOLE(z) CHECK_CONSOLE_TYPE (z, mswindows) +#define CONCHECK_MSWINDOWS_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, mswindows) #define CONSOLE_STREAM_P(con) CONSOLE_TYPESYM_STREAM_P (CONSOLE_TYPE (con)) #define CHECK_STREAM_CONSOLE(z) CHECK_CONSOLE_TYPE (z, stream) @@ -501,9 +501,9 @@ #ifdef HAVE_X_WINDOWS extern Lisp_Object Qx; #endif /* HAVE_X_WINDOWS */ -#ifdef HAVE_W32GUI -extern Lisp_Object Qw32; -#endif /* HAVE_W32GUI */ +#ifdef HAVE_MS_WINDOWS +extern Lisp_Object Qmswindows; +#endif /* HAVE_MS_WINDOWS */ int valid_console_type_p (Lisp_Object type);