summaryrefslogtreecommitdiff
path: root/src/category.h
diff options
context:
space:
mode:
authorKim F. Storm <storm@cua.dk>2006-07-12 13:14:11 +0000
committerKim F. Storm <storm@cua.dk>2006-07-12 13:14:11 +0000
commit7e9d10c3dcca9f0b29b37c89d10d1d9521676b1a (patch)
tree8ab01723254880e5003ed8fd0c8e489ae9f6c475 /src/category.h
parent915a3e00ad84c76d314cfff3d1d984cd418cc407 (diff)
downloademacs-7e9d10c3dcca9f0b29b37c89d10d1d9521676b1a.tar.gz
(CHECK_CATEGORY, CHECK_CATEGORY_SET): Use CHECK_TYPE.
Diffstat (limited to 'src/category.h')
-rw-r--r--src/category.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/category.h b/src/category.h
index ade8704db09..413505ece61 100644
--- a/src/category.h
+++ b/src/category.h
@@ -54,10 +54,8 @@ Boston, MA 02110-1301, USA. */
#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 @@ Boston, MA 02110-1301, USA. */
#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))'. */