diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-10-08 15:06:31 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-10-08 15:06:31 +0200 |
| commit | 7014794467aac02be3a935a093e1bfb8ad410c12 (patch) | |
| tree | 0aa27b30dcdc8fc4e63c8d88d9b878d0b3ff9765 /src/termhooks.h | |
| parent | d6de17607045c1d33826a12983e33deb73426457 (diff) | |
| parent | c54ebba4e076caeb6105c6bb682252b139a169fa (diff) | |
Merge from trunk after cygw32 commit, and resolve conflicts.
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index 0afd7d97e7..285a1824ec 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -107,9 +107,9 @@ enum event_kind HORIZ_WHEEL_EVENT, /* A wheel event generated by a second horizontal wheel that is present on some mice. See WHEEL_EVENT. */ -#if defined (WINDOWSNT) +#if defined (HAVE_NTGUI) LANGUAGE_CHANGE_EVENT, /* A LANGUAGE_CHANGE_EVENT is - generated on WINDOWSNT or Mac OS + generated when HAVE_NTGUI or on Mac OS when the keyboard layout or input language is changed by the user. */ @@ -188,7 +188,7 @@ enum event_kind , CONFIG_CHANGED_EVENT -#ifdef WINDOWSNT +#ifdef HAVE_NTGUI /* Generated when an APPCOMMAND event is received, in response to Multimedia or Internet buttons on some keyboards. Such keys are available as normal function keys on X through the |