Commit 8db4b52f authored by Daniel Colascione's avatar Daniel Colascione
Browse files

Fix cygw32 build break

parent c868b919
2012-12-10 Daniel Colascione <dancol@dancol.org> 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 * w32gui.h (hprevinst, lpCmdLine, nCmdShow): Remove unused
declarations. declarations.
   
......
...@@ -3909,6 +3909,8 @@ kbd_buffer_get_event (KBOARD **kbp, ...@@ -3909,6 +3909,8 @@ kbd_buffer_get_event (KBOARD **kbp,
make_number (event->modifiers))); make_number (event->modifiers)));
kbd_fetch_ptr = event + 1; kbd_fetch_ptr = event + 1;
} }
#endif
#ifdef WINDOWSNT
else if (event->kind == FILE_NOTIFY_EVENT) else if (event->kind == FILE_NOTIFY_EVENT)
{ {
/* Make an event (file-notify (DESCRIPTOR ACTION FILE) CALLBACK). */ /* Make an event (file-notify (DESCRIPTOR ACTION FILE) CALLBACK). */
...@@ -11361,6 +11363,9 @@ syms_of_keyboard (void) ...@@ -11361,6 +11363,9 @@ syms_of_keyboard (void)
#ifdef HAVE_NTGUI #ifdef HAVE_NTGUI
DEFSYM (Qlanguage_change, "language-change"); DEFSYM (Qlanguage_change, "language-change");
#endif
#ifdef WINDOWSNT
DEFSYM (Qfile_w32notify, "file-w32notify"); DEFSYM (Qfile_w32notify, "file-w32notify");
#endif #endif
......
...@@ -3244,6 +3244,7 @@ lispy_file_action (DWORD action) ...@@ -3244,6 +3244,7 @@ lispy_file_action (DWORD action)
return retval; return retval;
} }
#ifdef WINDOWSNT
/* Put file notifications into the Emacs input event queue. This /* Put file notifications into the Emacs input event queue. This
function runs when the WM_EMACS_FILENOTIFY message arrives from a function runs when the WM_EMACS_FILENOTIFY message arrives from a
watcher thread. */ watcher thread. */
...@@ -3320,6 +3321,7 @@ queue_notifications (struct input_event *event, W32Msg *msg, struct frame *f, ...@@ -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. */ /* We've stuffed all the events ourselves, so w32_read_socket shouldn't. */
event->kind = NO_EVENT; event->kind = NO_EVENT;
} }
#endif
/* Function to report a mouse movement to the mainstream Emacs code. /* Function to report a mouse movement to the mainstream Emacs code.
...@@ -4954,11 +4956,13 @@ w32_read_socket (struct terminal *terminal, ...@@ -4954,11 +4956,13 @@ w32_read_socket (struct terminal *terminal,
check_visibility = 1; check_visibility = 1;
break; break;
#ifdef WINDOWSNT
case WM_EMACS_FILENOTIFY: case WM_EMACS_FILENOTIFY:
f = x_window_to_frame (dpyinfo, msg.msg.hwnd); f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
if (f) if (f)
queue_notifications (&inev, &msg, f, &count); queue_notifications (&inev, &msg, f, &count);
break; break;
#endif
default: default:
/* Check for messages registered at runtime. */ /* Check for messages registered at runtime. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment