diff options
| author | Ken Brown <kbrown@cornell.edu> | 2016-03-06 12:08:39 -0500 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2016-03-06 12:08:39 -0500 |
| commit | 258f1034d7f451da1c05ef246ca0849d0c0a9c3c (patch) | |
| tree | 6d0e9b7b535c5aa8cb342bcf55f33b087f01c13a /src | |
| parent | 69e03ddccf47fc29126317dd3317313ecd92b797 (diff) | |
| download | emacs-258f1034d7f451da1c05ef246ca0849d0c0a9c3c.tar.gz | |
Fix Cygwin-w32 build
* src/w32fns.c (funhook, setup_w32_kbdhook, remove_w32_kbdhook):
Define only if WINDOWSNT, and update all uses accordingly.
* src/w32term.h (check_w32_winkey_state, setup_w32_kbdhook)
(remove_w32_kbdhook): Declare only if WINDOWSNT.
(w32_kbdhook_active): Define as 0 if not WINDOWSNT.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32fns.c | 6 | ||||
| -rw-r--r-- | src/w32term.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index 10c8af71073..0fe6a6fd2b3 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -2112,6 +2112,7 @@ my_post_msg (W32Msg * wmsg, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) post_msg (wmsg); } +#ifdef WINDOWSNT /* The Windows keyboard hook callback. */ static LRESULT CALLBACK funhook (int code, WPARAM w, LPARAM l) @@ -2370,6 +2371,7 @@ remove_w32_kbdhook (void) kbdhook.hook = NULL; } } +#endif /* WINDOWSNT */ /* Mark a specific key combination as hooked, preventing it to be handled by the system. */ @@ -4734,12 +4736,16 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) my_post_msg (&wmsg, hwnd, msg, wParam, lParam); goto dflt; +#ifdef WINDOWSNT case WM_CREATE: setup_w32_kbdhook (); goto dflt; +#endif case WM_DESTROY: +#ifdef WINDOWSNT remove_w32_kbdhook (); +#endif CoUninitialize (); return 0; diff --git a/src/w32term.h b/src/w32term.h index aed89d8c254..7c23bc43a1f 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -738,11 +738,15 @@ extern int handle_file_notifications (struct input_event *); extern void w32_initialize_display_info (Lisp_Object); extern void initialize_w32_display (struct terminal *, int *, int *); +#ifdef WINDOWSNT /* Keyboard hooks. */ extern void setup_w32_kbdhook (void); extern void remove_w32_kbdhook (void); extern int check_w32_winkey_state (int); #define w32_kbdhook_active (os_subtype != OS_9X) +#else +#define w32_kbdhook_active 0 +#endif /* Keypad command key support. W32 doesn't have virtual keys defined for the function keys on the keypad (they are mapped to the standard |