diff src/events.c @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents e121b013d1f0
children 489f57a838ef
line wrap: on
line diff
--- a/src/events.c	Mon Aug 13 09:54:24 2007 +0200
+++ b/src/events.c	Mon Aug 13 09:55:28 2007 +0200
@@ -1113,17 +1113,18 @@
 		      XEVENT (event)->timestamp);
 }
 
-#define CHECK_EVENT_TYPE(e,t1,sym)		\
-{ CHECK_LIVE_EVENT (e);				\
+#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)					\
-{ 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);				\
+  if (XEVENT(e)->event_type != (t1) &&		\
+      XEVENT(e)->event_type != (t2))		\
+    e = wrong_type_argument ((sym),(e));	\
+} while (0)
 
 DEFUN ("event-key", Fevent_key, 1, 1, 0, /*
 Return the Keysym of the key-press event EVENT.
@@ -1374,7 +1375,7 @@
     ret_w = 0;
 
   /* #### pixel_to_glyph_translation() sometimes returns garbage...
-     The word has type Lisp_Record (presumably meaning `extent') but the
+     The word has type Lisp_Type_Record (presumably meaning `extent') but the
      pointer points to random memory, often filled with 0, sometimes not.
    */
   /* #### Chuck, do we still need this crap? */