X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fevent-stream.c;h=f0089353db3344a7cff26459348735ace6efe839;hb=c9523ecda2bbac84807cc0bf460540ad71bf8943;hp=52e800652dd66edb296f33d3cf4877cabea7c2b9;hpb=28a3fa29bc0bd9a124b6e3379e82d62e815c22a2;p=chise%2Fxemacs-chise.git

diff --git a/src/event-stream.c b/src/event-stream.c
index 52e8006..f008935 100644
--- a/src/event-stream.c
+++ b/src/event-stream.c
@@ -413,7 +413,7 @@ finalize_command_builder (void *header, int for_disksave)
 
 DEFINE_LRECORD_IMPLEMENTATION ("command-builder", command_builder,
                                mark_command_builder, internal_object_printer,
-			       finalize_command_builder, 0, 0,
+			       finalize_command_builder, 0, 0, 0,
 			       struct command_builder);
 
 static void
@@ -432,7 +432,7 @@ allocate_command_builder (Lisp_Object console)
 {
   Lisp_Object builder_obj;
   struct command_builder *builder =
-    alloc_lcrecord_type (struct command_builder, lrecord_command_builder);
+    alloc_lcrecord_type (struct command_builder, &lrecord_command_builder);
 
   builder->console = console;
   reset_command_builder_event_chain (builder);
@@ -5389,8 +5389,9 @@ init_event_stream (void)
 	  {
 	    /* For TTY's, use the Xt event loop if we can; it allows
 	       us to later open an X connection. */
-#if defined (HAVE_MS_WINDOWS) && defined (HAVE_MSG_SELECT) \
-	    && !defined (DEBUG_TTY_EVENT_STREAM)
+#if defined (HAVE_MS_WINDOWS) && (!defined (HAVE_TTY) \
+                || (defined (HAVE_MSG_SELECT) \
+	    && !defined (DEBUG_TTY_EVENT_STREAM)))
 	    init_event_mswindows_late ();
 #elif defined (HAVE_X_WINDOWS) && !defined (DEBUG_TTY_EVENT_STREAM)
 	    init_event_Xt_late ();