This commit was generated by cvs2svn to compensate for changes in r360,

[chise/xemacs-chise.git.1] / src / events.c

diff --git a/src/events.c b/src/events.c
index 6fe8e6e..1a2db77 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -87,7 +87,7 @@ deinitialize_event (Lisp_Object ev)
     ((int *) event) [i] = 0xdeadbeef;
   event->event_type = dead_event;
   event->channel = Qnil;
-  set_lheader_implementation (&(event->lheader), lrecord_event);
+  set_lheader_implementation (&(event->lheader), &lrecord_event);
   XSET_EVENT_NEXT (ev, Qnil);
 }
 
@@ -96,7 +96,7 @@ void
 zero_event (struct Lisp_Event *e)
 {
   xzero (*e);
-  set_lheader_implementation (&(e->lheader), lrecord_event);
+  set_lheader_implementation (&(e->lheader), &lrecord_event);
   e->event_type = empty_event;
   e->next = Qnil;
   e->channel = Qnil;
@@ -179,7 +179,7 @@ print_event (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
        assert (INTP (Vx));
        Vy = Fevent_y_pixel (obj);
        assert (INTP (Vy));
-       sprintf (buf, "#<motion-event %ld, %ld", (long)(XINT (Vx)), (long)(XINT (Vy)));
+       sprintf (buf, "#<motion-event %ld, %ld", (long) XINT (Vx), (long) XINT (Vy));
        write_c_string (buf, printcharfun);
        break;
       }
@@ -375,7 +375,7 @@ event_hash (Lisp_Object obj, int depth)
 
 DEFINE_BASIC_LRECORD_IMPLEMENTATION ("event", event,
                                     mark_event, print_event, 0, event_equal,
-                                    event_hash, struct Lisp_Event);
+                                    event_hash, 0, struct Lisp_Event);
 
 \f
 DEFUN ("make-event", Fmake_event, 0, 2, 0, /*
@@ -1455,22 +1455,28 @@ Return the timestamp of the event object EVENT.
 #define CHECK_EVENT_TYPE(e,t1,sym) do {                \
   CHECK_LIVE_EVENT (e);                                \
   if (XEVENT(e)->event_type != (t1))           \
-    e = wrong_type_argument ((sym),(e));       \
+    e = wrong_type_argument (sym,e);           \
 } while (0)
 
-#define CHECK_EVENT_TYPE2(e,t1,t2,sym) do {    \
-  CHECK_LIVE_EVENT (e);                                \
-  if (XEVENT(e)->event_type != (t1) &&         \
-      XEVENT(e)->event_type != (t2))           \
-    e = wrong_type_argument ((sym),(e));       \
+#define CHECK_EVENT_TYPE2(e,t1,t2,sym) do {            \
+  CHECK_LIVE_EVENT (e);                                        \
+  {                                                    \
+    emacs_event_type CET_type = XEVENT (e)->event_type;        \
+    if (CET_type != (t1) &&                            \
+       CET_type != (t2))                               \
+      e = wrong_type_argument (sym,e);                 \
+  }                                                    \
 } while (0)
 
-#define CHECK_EVENT_TYPE3(e,t1,t2,t3,sym) do { \
-  CHECK_LIVE_EVENT (e);                                \
-  if (XEVENT(e)->event_type != (t1) &&         \
-      XEVENT(e)->event_type != (t2) &&         \
-      XEVENT(e)->event_type != (t3))           \
-    e = wrong_type_argument ((sym),(e));       \
+#define CHECK_EVENT_TYPE3(e,t1,t2,t3,sym) do {         \
+  CHECK_LIVE_EVENT (e);                                        \
+  {                                                    \
+    emacs_event_type CET_type = XEVENT (e)->event_type;        \
+    if (CET_type != (t1) &&                            \
+       CET_type != (t2) &&                             \
+       CET_type != (t3))                               \
+      e = wrong_type_argument (sym,e);                 \
+  }                                                    \
 } while (0)
 
 DEFUN ("event-key", Fevent_key, 1, 1, 0, /*