# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1152710040 0
# Node ID 6b4b6ba02f17d7dfadab9f143cf912aed65e4760
# Parent  7b7a32c8c7670de4636a9f2411b08d8273bad4f0
(CHECK_FRAME, CHECK_LIVE_FRAME): Use CHECK_TYPE.

diff -r 7b7a32c8c767 -r 6b4b6ba02f17 src/frame.h
--- a/src/frame.h	Wed Jul 12 13:13:44 2006 +0000
+++ b/src/frame.h	Wed Jul 12 13:14:00 2006 +0000
@@ -760,18 +760,11 @@
    (f)->visible = (f)->async_visible, \
    (f)->iconified = (f)->async_iconified)
 
-#define CHECK_FRAME(x)					\
-     do {						\
-       if (! FRAMEP (x))				\
-         x = wrong_type_argument (Qframep, (x));	\
-     } while (0)
+#define CHECK_FRAME(x) \
+  CHECK_TYPE (FRAMEP (x), Qframep, x)
 
-#define CHECK_LIVE_FRAME(x)				\
-     do {						\
-       if (! FRAMEP (x)					\
-	   || ! FRAME_LIVE_P (XFRAME (x)))		\
-         x = wrong_type_argument (Qframe_live_p, (x));	\
-     } while (0)
+#define CHECK_LIVE_FRAME(x) \
+  CHECK_TYPE (FRAMEP (x) && FRAME_LIVE_P (XFRAME (x)), Qframe_live_p, x)
 
 /* FOR_EACH_FRAME (LIST_VAR, FRAME_VAR) followed by a statement is a
    `for' loop which iterates over the elements of Vframe_list.  The