diff options
| author | Daniel Colascione <dancol@dancol.org> | 2012-12-10 12:46:20 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2012-12-10 12:46:20 -0800 |
| commit | bef34dd52f73222d86bc2eabdddbbdb710b2475d (patch) | |
| tree | bd8e934b592d7c923f5c932d5cc9372ef363caae | |
| parent | ef73c76aacdfa53c98143e4f10cc724308577dea (diff) | |
| download | emacs-bef34dd52f73222d86bc2eabdddbbdb710b2475d.tar.gz | |
Fix cygw32 build break
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/keyboard.c | 5 | ||||
| -rw-r--r-- | src/w32term.c | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fe2801e8635..17d495a6439 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2012-12-10 Daniel Colascione <dancol@dancol.org> + * w32term.c, keyboard.c: Fix build break in cygw32 by omitting + Windows file notification functionality unless WINDOWSNT. + * w32gui.h (hprevinst, lpCmdLine, nCmdShow): Remove unused declarations. diff --git a/src/keyboard.c b/src/keyboard.c index ecf1551622f..e3dcb8a438e 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -3909,6 +3909,8 @@ kbd_buffer_get_event (KBOARD **kbp, make_number (event->modifiers))); kbd_fetch_ptr = event + 1; } +#endif +#ifdef WINDOWSNT else if (event->kind == FILE_NOTIFY_EVENT) { /* Make an event (file-notify (DESCRIPTOR ACTION FILE) CALLBACK). */ @@ -11361,6 +11363,9 @@ syms_of_keyboard (void) #ifdef HAVE_NTGUI DEFSYM (Qlanguage_change, "language-change"); +#endif + +#ifdef WINDOWSNT DEFSYM (Qfile_w32notify, "file-w32notify"); #endif diff --git a/src/w32term.c b/src/w32term.c index d7c5d075416..7c53097e313 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -3244,6 +3244,7 @@ lispy_file_action (DWORD action) return retval; } +#ifdef WINDOWSNT /* Put file notifications into the Emacs input event queue. This function runs when the WM_EMACS_FILENOTIFY message arrives from a watcher thread. */ @@ -3320,6 +3321,7 @@ queue_notifications (struct input_event *event, W32Msg *msg, struct frame *f, /* We've stuffed all the events ourselves, so w32_read_socket shouldn't. */ event->kind = NO_EVENT; } +#endif /* Function to report a mouse movement to the mainstream Emacs code. @@ -4954,11 +4956,13 @@ w32_read_socket (struct terminal *terminal, check_visibility = 1; break; +#ifdef WINDOWSNT case WM_EMACS_FILENOTIFY: f = x_window_to_frame (dpyinfo, msg.msg.hwnd); if (f) queue_notifications (&inev, &msg, f, &count); break; +#endif default: /* Check for messages registered at runtime. */ |