aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKim F. Storm2006-07-12 13:14:00 +0000
committerKim F. Storm2006-07-12 13:14:00 +0000
commit915a3e00ad84c76d314cfff3d1d984cd418cc407 (patch)
tree036b5449e3fce256e89ed49ce90c59983c482e92 /src
parentc8a39089de0f4b65fc2936618087c1e5e15c3920 (diff)
downloademacs-915a3e00ad84c76d314cfff3d1d984cd418cc407.tar.gz
emacs-915a3e00ad84c76d314cfff3d1d984cd418cc407.zip
(CHECK_FRAME, CHECK_LIVE_FRAME): Use CHECK_TYPE.
Diffstat (limited to 'src')
-rw-r--r--src/frame.h17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/frame.h b/src/frame.h
index 940b5409636..50e7c0660b4 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -760,18 +760,11 @@ typedef struct frame *FRAME_PTR;
760 (f)->visible = (f)->async_visible, \ 760 (f)->visible = (f)->async_visible, \
761 (f)->iconified = (f)->async_iconified) 761 (f)->iconified = (f)->async_iconified)
762 762
763#define CHECK_FRAME(x) \ 763#define CHECK_FRAME(x) \
764 do { \ 764 CHECK_TYPE (FRAMEP (x), Qframep, x)
765 if (! FRAMEP (x)) \ 765
766 x = wrong_type_argument (Qframep, (x)); \ 766#define CHECK_LIVE_FRAME(x) \
767 } while (0) 767 CHECK_TYPE (FRAMEP (x) && FRAME_LIVE_P (XFRAME (x)), Qframe_live_p, x)
768
769#define CHECK_LIVE_FRAME(x) \
770 do { \
771 if (! FRAMEP (x) \
772 || ! FRAME_LIVE_P (XFRAME (x))) \
773 x = wrong_type_argument (Qframe_live_p, (x)); \
774 } while (0)
775 768
776/* FOR_EACH_FRAME (LIST_VAR, FRAME_VAR) followed by a statement is a 769/* FOR_EACH_FRAME (LIST_VAR, FRAME_VAR) followed by a statement is a
777 `for' loop which iterates over the elements of Vframe_list. The 770 `for' loop which iterates over the elements of Vframe_list. The