# HG changeset patch
# User Kim F. Storm <storm@cua.dk>
# Date 1152710051 0
# Node ID d015c4ec8df485e6d533fd52ac21cfee1687ce92
# Parent  6b4b6ba02f17d7dfadab9f143cf912aed65e4760
(CHECK_CATEGORY, CHECK_CATEGORY_SET): Use CHECK_TYPE.

diff -r 6b4b6ba02f17 -r d015c4ec8df4 src/category.h
--- a/src/category.h	Wed Jul 12 13:14:00 2006 +0000
+++ b/src/category.h	Wed Jul 12 13:14:11 2006 +0000
@@ -54,10 +54,8 @@
 #define CATEGORYP(x) \
   (INTEGERP ((x)) && XFASTINT ((x)) >= 0x20 && XFASTINT ((x)) <= 0x7E)
 
-#define CHECK_CATEGORY(x)						\
-  do {									\
-    if (!CATEGORYP ((x))) x = wrong_type_argument (Qcategoryp, (x));	\
-  } while (0)
+#define CHECK_CATEGORY(x) \
+  CHECK_TYPE (CATEGORYP (x), Qcategoryp, x)
 
 #define XCATEGORY_SET XBOOL_VECTOR
 
@@ -72,10 +70,8 @@
 #define SET_CATEGORY_SET(category_set, category, val) \
   (Faset (category_set, category, val))
 
-#define CHECK_CATEGORY_SET(x)					   \
-  do {									   \
-    if (!CATEGORY_SET_P ((x))) x = wrong_type_argument (Qcategorysetp, (x)); \
-  } while (0)
+#define CHECK_CATEGORY_SET(x) \
+  CHECK_TYPE (CATEGORY_SET_P (x), Qcategorysetp, x)
 
 /* Return 1 if CATEGORY_SET contains CATEGORY, else return 0.
    The faster version of `!NILP (Faref (category_set, category))'.  */