git rid of __check_* in favor of CHECK_*

102 files changed, 101 insertions, 106 deletions

diff --git a/src/_safety.h b/src/_safety.h
index 7dd08dc2..115c7167 100644
--- a/src/_safety.h
+++ b/src/_safety.h
@@ -86,7 +86,6 @@ extern struct __checked_call {
 		__setchecked(NULL, NULL, 0); \
 		return ret; \
 	}
-#define __check_0(__type, __def, __fn) CHECK_0(__type, __def, __fn)
 
 #define CHECK_1(__type, __def, __fn, __t1) \
 	__type __##__fn(const char * file, const char * func, unsigned long long line, __t1 a1) { \
@@ -96,7 +95,6 @@ extern struct __checked_call {
 		__setchecked(NULL, NULL, 0); \
 		return ret; \
 	}
-#define __check_1(__type, __def, __fn, __t1) CHECK_1(__type, __def, __fn, __t1)
 
 #define CHECK_2(__type, __def, __fn, __t1, __t2) \
 	__type __##__fn(const char * file, const char * func, unsigned long long line, __t1 a1, __t2 a2) { \
@@ -106,7 +104,6 @@ extern struct __checked_call {
 		__setchecked(NULL, NULL, 0); \
 		return ret; \
 	}
-#define __check_2(__type, __def, __fn, __t1, __t2) CHECK_2(__type, __def, __fn, __t1, __t2)
 
 #define CHECK_3(__type, __def, __fn, __t1, __t2, __t3) \
 	__type __##__fn(const char * file, const char * func, unsigned long long line, __t1 a1, __t2 a2, __t3 a3) { \
@@ -116,7 +113,6 @@ extern struct __checked_call {
 		__setchecked(NULL, NULL, 0); \
 		return ret; \
 	}
-#define __check_3(__type, __def, __fn, __t1, __t2, __t3) CHECK_3(__type, __def, __fn, __t1, __t2, __t3)
 
 #define CHECK_4(__type, __def, __fn, __t1, __t2, __t3, __t4) \
 	__type __##__fn(const char * file, const char * func, unsigned long long line, __t1 a1, __t2 a2, __t3 a3, __t4 a4) { \
@@ -126,7 +122,6 @@ extern struct __checked_call {
 		__setchecked(NULL, NULL, 0); \
 		return ret; \
 	}
-#define __check_4(__type, __def, __fn, __t1, __t2, __t3, __t4) CHECK_4(__type, __def, __fn, __t1, __t2, __t3, __t4)
 #else
 
 #define ASSERT_NOOVERLAP(__x, __y, __s)
diff --git a/src/ctype/isalnum.c b/src/ctype/isalnum.c
index 2cd247be..26a1ad01 100644
--- a/src/ctype/isalnum.c
+++ b/src/ctype/isalnum.c
@@ -10,7 +10,7 @@ int isalnum(int c)
 	return isalpha(c) || isdigit(c);
 }
 
-__check_1(int, 0, isalnum, int)
+CHECK_1(int, 0, isalnum, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class
diff --git a/src/ctype/isalpha.c b/src/ctype/isalpha.c
index 670d7c51..cbf53284 100644
--- a/src/ctype/isalpha.c
+++ b/src/ctype/isalpha.c
@@ -10,7 +10,7 @@ int isalpha(int c)
 	return islower(c) || isupper(c);
 }
 
-__check_1(int, 0, isalpha, int)
+CHECK_1(int, 0, isalpha, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class
diff --git a/src/ctype/isblank.c b/src/ctype/isblank.c
index 2f418760..3568241c 100644
--- a/src/ctype/isblank.c
+++ b/src/ctype/isblank.c
@@ -12,7 +12,7 @@ int isblank(int c)
 	return c == EOF ? 0 : map[c] & CT_BLANK;
 }
 
-__check_1(int, 0, isblank, int)
+CHECK_1(int, 0, isblank, int)
 
 /***
 tests whether a character is a of the character class CCLASS(blank) in the
diff --git a/src/ctype/iscntrl.c b/src/ctype/iscntrl.c
index be619f83..a8107d05 100644
--- a/src/ctype/iscntrl.c
+++ b/src/ctype/iscntrl.c
@@ -12,7 +12,7 @@ int iscntrl(int c)
 	return c == EOF ? 0 : map[c] & CT_CNTRL;
 }
 
-__check_1(int, 0, iscntrl, int)
+CHECK_1(int, 0, iscntrl, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class CHARACTER_CLASS(cntrl)
diff --git a/src/ctype/isdigit.c b/src/ctype/isdigit.c
index 23413d35..16d93f31 100644
--- a/src/ctype/isdigit.c
+++ b/src/ctype/isdigit.c
@@ -11,7 +11,7 @@ int isdigit(int c)
 	return isxdigit(c) && !isalpha(c);
 }
 
-__check_1(int, 0, isdigit, int)
+CHECK_1(int, 0, isdigit, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class CHARACTER_CLASS(digit)
diff --git a/src/ctype/isgraph.c b/src/ctype/isgraph.c
index 365b795f..be28a436 100644
--- a/src/ctype/isgraph.c
+++ b/src/ctype/isgraph.c
@@ -12,7 +12,7 @@ int isgraph(int c)
 	return c == EOF ? 0 : map[c] & CT_GRAPH;
 }
 
-__check_1(int, 0, isgraph, int)
+CHECK_1(int, 0, isgraph, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class CHARACTER_CLASS(graph)
diff --git a/src/ctype/islower.c b/src/ctype/islower.c
index 5481acee..30aa16d1 100644
--- a/src/ctype/islower.c
+++ b/src/ctype/islower.c
@@ -12,7 +12,7 @@ int islower(int c)
 	return c == EOF ? 0 : map[c] & CT_LOWER;
 }
 
-__check_1(int, 0, islower, int)
+CHECK_1(int, 0, islower, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class CHARACTER_CLASS(lower)
diff --git a/src/ctype/isprint.c b/src/ctype/isprint.c
index 8909a722..5cbc726c 100644
--- a/src/ctype/isprint.c
+++ b/src/ctype/isprint.c
@@ -12,7 +12,7 @@ int isprint(int c)
 	return c == EOF ? 0 : map[c] & CT_PRINT;
 }
 
-__check_1(int, 0, isprint, int)
+CHECK_1(int, 0, isprint, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class CHARACTER_CLASS(print)
diff --git a/src/ctype/ispunct.c b/src/ctype/ispunct.c
index 50ab7fef..17bd3e76 100644
--- a/src/ctype/ispunct.c
+++ b/src/ctype/ispunct.c
@@ -12,7 +12,7 @@ int ispunct(int c)
 	return c == EOF ? 0 : map[c] & CT_PUNCT;
 }
 
-__check_1(int, 0, ispunct, int)
+CHECK_1(int, 0, ispunct, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class CHARACTER_CLASS(punct)
diff --git a/src/ctype/isspace.c b/src/ctype/isspace.c
index 2cff50c9..654d50fb 100644
--- a/src/ctype/isspace.c
+++ b/src/ctype/isspace.c
@@ -12,7 +12,7 @@ int isspace(int c)
 	return c == EOF ? 0 : map[c] & CT_SPACE;
 }
 
-__check_1(int, 0, isspace, int)
+CHECK_1(int, 0, isspace, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class CHARACTER_CLASS(space)
diff --git a/src/ctype/isupper.c b/src/ctype/isupper.c
index 039e5f72..c21be203 100644
--- a/src/ctype/isupper.c
+++ b/src/ctype/isupper.c
@@ -12,7 +12,7 @@ int isupper(int c)
 	return c == EOF ? 0 : map[c] & CT_UPPER;
 }
 
-__check_1(int, 0, isupper, int)
+CHECK_1(int, 0, isupper, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class CHARACTER_CLASS(upper)
diff --git a/src/ctype/isxdigit.c b/src/ctype/isxdigit.c
index 5207bda7..8a227e2a 100644
--- a/src/ctype/isxdigit.c
+++ b/src/ctype/isxdigit.c
@@ -12,7 +12,7 @@ int isxdigit(int c)
 	return c == EOF ? 0 : map[c] & CT_XDIGIT;
 }
 
-__check_1(int, 0, isxdigit, int)
+CHECK_1(int, 0, isxdigit, int)
 
 /***
 tests whether ARGUMENT(c) is a character in the class CHARACTER_CLASS(xdigit)
diff --git a/src/ctype/tolower.c b/src/ctype/tolower.c
index 0cbdb9d4..d5284159 100644
--- a/src/ctype/tolower.c
+++ b/src/ctype/tolower.c
@@ -12,7 +12,7 @@ int tolower(int c)
 	return c == EOF ? EOF : map[c];
 }
 
-__check_1(int, 0, tolower, int)
+CHECK_1(int, 0, tolower, int)
 
 /***
 converts an uppercase letter to its equivalent lowercase letter in the current
diff --git a/src/ctype/toupper.c b/src/ctype/toupper.c
index 43cd52fd..a3481200 100644
--- a/src/ctype/toupper.c
+++ b/src/ctype/toupper.c
@@ -12,7 +12,7 @@ int toupper(int c)
 	return c == EOF ? EOF : map[c];
 }
 
-__check_1(int, 0, toupper, int)
+CHECK_1(int, 0, toupper, int)
 
 /***
 converts a lowercase letter to its equivalent uppercase letter in the current
diff --git a/src/inttypes/imaxabs.c b/src/inttypes/imaxabs.c
index ca1d93c4..9a49cfc9 100644
--- a/src/inttypes/imaxabs.c
+++ b/src/inttypes/imaxabs.c
@@ -15,7 +15,7 @@ intmax_t imaxabs(intmax_t j)
 	return j < 0 ? -j : j;
 }
 
-__check_1(intmax_t, 0, imaxabs, intmax_t)
+CHECK_1(intmax_t, 0, imaxabs, intmax_t)
 
 /***
 computes the absolute value of ARGUMENT(j).
diff --git a/src/inttypes/imaxdiv.c b/src/inttypes/imaxdiv.c
index 16f19c48..7600cfab 100644
--- a/src/inttypes/imaxdiv.c
+++ b/src/inttypes/imaxdiv.c
@@ -13,7 +13,7 @@ imaxdiv_t imaxdiv(intmax_t numer, intmax_t denom)
 	return r;
 }
 
-__check_2(imaxdiv_t, {0}, imaxdiv, intmax_t, intmax_t)
+CHECK_2(imaxdiv_t, {0}, imaxdiv, intmax_t, intmax_t)
 
 /***
 computes both the quotient and remainder of ARGUMENT(numer)
diff --git a/src/inttypes/strtoimax.c b/src/inttypes/strtoimax.c
index 01a8bfdb..488729c7 100644
--- a/src/inttypes/strtoimax.c
+++ b/src/inttypes/strtoimax.c
@@ -19,7 +19,7 @@ intmax_t strtoimax(const char * restrict nptr, char ** restrict endptr, int base
 	return ret;
 }
 
-__check_3(intmax_t, 0, strtoimax, const char * restrict, char ** restrict, int)
+CHECK_3(intmax_t, 0, strtoimax, const char * restrict, char ** restrict, int)
 
 /*
 STDC(199901)
diff --git a/src/inttypes/strtoumax.c b/src/inttypes/strtoumax.c
index 77ae2f10..4370ccb0 100644
--- a/src/inttypes/strtoumax.c
+++ b/src/inttypes/strtoumax.c
@@ -19,7 +19,7 @@ uintmax_t strtoumax(const char *restrict nptr, char ** restrict endptr, int base
 	return ret;
 }
 
-__check_3(uintmax_t, 0, strtoumax, const char *restrict, char ** restrict, int)
+CHECK_3(uintmax_t, 0, strtoumax, const char *restrict, char ** restrict, int)
 
 /*
 STDC(199901)
diff --git a/src/inttypes/wcstoimax.c b/src/inttypes/wcstoimax.c
index b75e61ca..a63a8a29 100644
--- a/src/inttypes/wcstoimax.c
+++ b/src/inttypes/wcstoimax.c
@@ -20,7 +20,7 @@ intmax_t wcstoimax(const wchar_t * restrict nptr, wchar_t ** restrict endptr, in
 	return ret;
 }
 
-__check_3(intmax_t, 0, wcstoimax, const wchar_t * restrict, wchar_t **restrict, int)
+CHECK_3(intmax_t, 0, wcstoimax, const wchar_t * restrict, wchar_t **restrict, int)
 
 /*
 STDC(199901)
diff --git a/src/inttypes/wcstoumax.c b/src/inttypes/wcstoumax.c
index 59788f90..089ee104 100644
--- a/src/inttypes/wcstoumax.c
+++ b/src/inttypes/wcstoumax.c
@@ -20,7 +20,7 @@ uintmax_t wcstoumax(const wchar_t * restrict nptr, wchar_t ** restrict endptr, i
 	return ret;
 }
 
-__check_3(uintmax_t, 0, wcstoumax, const wchar_t * restrict, wchar_t ** restrict, int)
+CHECK_3(uintmax_t, 0, wcstoumax, const wchar_t * restrict, wchar_t ** restrict, int)
 
 /*
 STDC(199901)
diff --git a/src/locale/localeconv.c b/src/locale/localeconv.c
index 4e87bfb3..9dc79302 100644
--- a/src/locale/localeconv.c
+++ b/src/locale/localeconv.c
@@ -15,7 +15,7 @@ struct lconv * localeconv(void)
 	return &(__get_locale()->lconv);
 }
 
-__check_0(struct lconv *, NULL, localeconv)
+CHECK_0(struct lconv *, NULL, localeconv)
 
 /***
 fills in a STRUCTDEF(lconv) in the current locale for
diff --git a/src/locale/setlocale.c b/src/locale/setlocale.c
index 521b118e..bfc15342 100644
--- a/src/locale/setlocale.c
+++ b/src/locale/setlocale.c
@@ -45,7 +45,7 @@ char * setlocale(int category, const char *locale)
 	return __load_locale(l, mask, locale);
 }
 
-__check_2(char *, NULL, setlocale, int, const char *)
+CHECK_2(char *, NULL, setlocale, int, const char *)
 
 /***
 sets or retrieves the current global locale of the
diff --git a/src/setjmp/setjmp.c b/src/setjmp/setjmp.c
index 02b95789..091f0993 100644
--- a/src/setjmp/setjmp.c
+++ b/src/setjmp/setjmp.c
@@ -12,7 +12,7 @@ int setjmp(jmp_buf env)
 	return ___setjmp(env);
 }
 
-__check_1(int, 0, setjmp, jmp_buf)
+CHECK_1(int, 0, setjmp, jmp_buf)
 
 /***
 saves the current state of the calling environment
diff --git a/src/signal/raise.c b/src/signal/raise.c
index bb2391df..44bf1b58 100644
--- a/src/signal/raise.c
+++ b/src/signal/raise.c
@@ -33,7 +33,7 @@ int raise(int sig)
 	#endif
 }
 
-__check_1(int, 0, raise, int)
+CHECK_1(int, 0, raise, int)
 
 /***
 sends the signal ARGUMENT(sig) to the current program.
diff --git a/src/string/memchr.c b/src/string/memchr.c
index 1c228220..aac59df0 100644
--- a/src/string/memchr.c
+++ b/src/string/memchr.c
@@ -25,7 +25,7 @@ void * memchr(const void *s, int c, size_t n)
 	return NULL;
 }
 
-__check_3(void *, 0, memchr, const void *, int, size_t)
+CHECK_3(void *, 0, memchr, const void *, int, size_t)
 
 /***
 searches the first ARGUMENT(n) bytes of memory at ARGUMENT(s) for
diff --git a/src/string/memcmp.c b/src/string/memcmp.c
index f87f849a..156c8b03 100644
--- a/src/string/memcmp.c
+++ b/src/string/memcmp.c
@@ -28,7 +28,7 @@ int memcmp(const void *s1, const void *s2, size_t n)
 	return 0;
 }
 
-__check_3(int, 0, memcmp, const void *, const void *, size_t)
+CHECK_3(int, 0, memcmp, const void *, const void *, size_t)
 
 /***
 compares the first ARGUMENT(n) bytes of memory at ARGUMENT(s1)
diff --git a/src/string/memcpy_s.c b/src/string/memcpy_s.c
index dc4179ea..2b5ebec7 100644
--- a/src/string/memcpy_s.c
+++ b/src/string/memcpy_s.c
@@ -18,7 +18,7 @@ errno_t memcpy_s(void * restrict s1, rsize_t s1max, const void * restrict s2, rs
 	return 0;
 }
 
-__check_4(errno_t, 0, memcpy_s, void * restrict, rsize_t, const void * restrict, rsize_t)
+CHECK_4(errno_t, 0, memcpy_s, void * restrict, rsize_t, const void * restrict, rsize_t)
 
 /***
 The fn(memcpy) copies arg(n) bytes from the object at arg(s2) to the object at
diff --git a/src/string/memmove.c b/src/string/memmove.c
index 0de82247..22677b6d 100644
--- a/src/string/memmove.c
+++ b/src/string/memmove.c
@@ -27,7 +27,7 @@ void * memmove(void *s1, const void *s2, size_t n)
 	return s1;
 }
 
-__check_3(void *, 0, memmove, void *, const void *, size_t)
+CHECK_3(void *, 0, memmove, void *, const void *, size_t)
 
 /***
 copies ARGUMENT(n) bytes of memory from the object at
diff --git a/src/string/memmove_s.c b/src/string/memmove_s.c
index a6d84b55..209a8957 100644
--- a/src/string/memmove_s.c
+++ b/src/string/memmove_s.c
@@ -18,7 +18,7 @@ errno_t memmove_s(void *s1, rsize_t s1max, const void *s2, rsize_t n)
 	return 0;
 }
 
-__check_4(errno_t, 0, memmove_s, void *, rsize_t, const void *, rsize_t)
+CHECK_4(errno_t, 0, memmove_s, void *, rsize_t, const void *, rsize_t)
 
 /***
 The fn(memmove) function copies arg(n) bytes of memory from the object at
diff --git a/src/string/memset.c b/src/string/memset.c
index a009ec94..0cda3b90 100644
--- a/src/string/memset.c
+++ b/src/string/memset.c
@@ -21,7 +21,7 @@ void * memset(void *s, int c, size_t n)
 	return s;
 }
 
-__check_3(void *, 0, memset, void *, int, size_t)
+CHECK_3(void *, 0, memset, void *, int, size_t)
 
 /***
 fills the first ARGUMENT(n) bytes of memory at ARGUMENT(s) with
diff --git a/src/string/memset_s.c b/src/string/memset_s.c
index f79c3e54..90157c9b 100644
--- a/src/string/memset_s.c
+++ b/src/string/memset_s.c
@@ -17,7 +17,7 @@ errno_t memset_s(void *s, rsize_t smax, int c, rsize_t n)
 	return 0;
 }
 
-__check_4(errno_t, 0, memset_s, void *, rsize_t, int, rsize_t)
+CHECK_4(errno_t, 0, memset_s, void *, rsize_t, int, rsize_t)
 
 /***
 The fn(memset) function fills the first arg(n) bytes of memory at arg(s) with
diff --git a/src/string/strcat.c b/src/string/strcat.c
index 5f5da102..afbdf84c 100644
--- a/src/string/strcat.c
+++ b/src/string/strcat.c
@@ -21,7 +21,7 @@ char * strcat(char * restrict s1, const char * restrict s2)
 	return s1;
 }
 
-__check_2(char *, 0, strcat, char * restrict, const char * restrict)
+CHECK_2(char *, 0, strcat, char * restrict, const char * restrict)
 
 /***
 appends a copy of the string at ARGUMENT(s2) to the end of
diff --git a/src/string/strcat_s.c b/src/string/strcat_s.c
index 45cfefd4..f5116325 100644
--- a/src/string/strcat_s.c
+++ b/src/string/strcat_s.c
@@ -12,7 +12,7 @@ errno_t strcat_s(char * restrict s1, rsize_t s1max, const char * restrict s2)
 	return 0;
 }
 
-__check_3(errno_t, 0, strcat_s, char * restrict, rsize_t, const char * restrict)
+CHECK_3(errno_t, 0, strcat_s, char * restrict, rsize_t, const char * restrict)
 
 /***
 The fn(strcat) function appends a copy of the string at arg(s2) to the end of
diff --git a/src/string/strchr.c b/src/string/strchr.c
index 92557030..cde96cbf 100644
--- a/src/string/strchr.c
+++ b/src/string/strchr.c
@@ -15,7 +15,7 @@ char * strchr(const char *s, int c)
 	return (char*)memchr(s, (char)c, strlen(s));
 }
 
-__check_2(char *, 0, strchr, const char *, int)
+CHECK_2(char *, 0, strchr, const char *, int)
 
 /***
 searches the string ARGUMENT(s) for the first occurrence of
diff --git a/src/string/strcmp.c b/src/string/strcmp.c
index 58102d79..750f6772 100644
--- a/src/string/strcmp.c
+++ b/src/string/strcmp.c
@@ -35,7 +35,7 @@ int strcmp(const char *s1, const char *s2)
 	return 0;
 }
 
-__check_2(int, 0, strcmp, const char *, const char *)
+CHECK_2(int, 0, strcmp, const char *, const char *)
 
 /***
 compares the strings at ARGUMENT(s1) and ARGUMENT(s2).
diff --git a/src/string/strcoll.c b/src/string/strcoll.c
index 8ad9361e..7091e30f 100644
--- a/src/string/strcoll.c
+++ b/src/string/strcoll.c
@@ -35,7 +35,7 @@ int strcoll(const char *s1, const char *s2)
 	return ret;
 }
 
-__check_2(int, 0, strcoll, const char *, const char *)
+CHECK_2(int, 0, strcoll, const char *, const char *)
 
 /***
 compares the collation values of the strings at ARGUMENT(s1) and ARGUMENT(s2).
diff --git a/src/string/strcpy.c b/src/string/strcpy.c
index 1faf6409..3f5339bf 100644
--- a/src/string/strcpy.c
+++ b/src/string/strcpy.c
@@ -22,7 +22,7 @@ char * strcpy(char * restrict s1, const char * restrict s2)
 	return p;
 }
 
-__check_2(char *, 0, strcpy, char * restrict, const char * restrict)
+CHECK_2(char *, 0, strcpy, char * restrict, const char * restrict)
 
 /***
 copies the string at ARGUMENT(s2) to ARGUMENT(s1), up to and
diff --git a/src/string/strcpy_s.c b/src/string/strcpy_s.c
index 89914f23..1e3546f2 100644
--- a/src/string/strcpy_s.c
+++ b/src/string/strcpy_s.c
@@ -14,7 +14,7 @@ errno_t strcpy_s(char * restrict s1, rsize_t s1max, const char * restrict s2)
 	return 0;
 }
 
-__check_3(errno_t, 0, strcpy_s, char * restrict, rsize_t, const char * restrict)
+CHECK_3(errno_t, 0, strcpy_s, char * restrict, rsize_t, const char * restrict)
 
 /***
 The fn(strcpy) function copies the string at arg(s2) to arg(s1), up to and
diff --git a/src/string/strcspn.c b/src/string/strcspn.c
index f2e8c588..b5c3c506 100644
--- a/src/string/strcspn.c
+++ b/src/string/strcspn.c
@@ -21,7 +21,7 @@ size_t strcspn(const char *s1, const char *s2)
 	return i;
 }
 
-__check_2(size_t, 0, strcspn, const char *, const char *)
+CHECK_2(size_t, 0, strcspn, const char *, const char *)
 
 /***
 the number of characters that the beginning of
diff --git a/src/string/strerror.c b/src/string/strerror.c
index 910d7490..69984886 100644
--- a/src/string/strerror.c
+++ b/src/string/strerror.c
@@ -26,7 +26,7 @@ char * strerror(int errnum)
 	return errstr;
 }
 
-__check_1(char *, 0, strerror, int)
+CHECK_1(char *, 0, strerror, int)
 
 /***
 converts the error number ARGUMENT(errnum) to an error message
diff --git a/src/string/strerror_s.c b/src/string/strerror_s.c
index 65ff77c4..bbc204b5 100644
--- a/src/string/strerror_s.c
+++ b/src/string/strerror_s.c
@@ -10,7 +10,7 @@ errno_t strerror_s(char *s, rsize_t maxsize, errno_t errnum)
 	return errnum;
 }
 
-__check_3(errno_t, 0, strerror_s, char *, rsize_t, errno_t)
+CHECK_3(errno_t, 0, strerror_s, char *, rsize_t, errno_t)
 
 /***
 The fn(strerror_s) converts the error number arg(errnum) to an error message
diff --git a/src/string/strerrorlen_s.c b/src/string/strerrorlen_s.c
index 5e0240da..9b05655a 100644
--- a/src/string/strerrorlen_s.c
+++ b/src/string/strerrorlen_s.c
@@ -9,7 +9,7 @@ size_t strerrorlen_s(errno_t errnum)
 	return strlen(buffer);
 }
 
-__check_1(size_t, 0, strerrorlen_s, errno_t)
+CHECK_1(size_t, 0, strerrorlen_s, errno_t)
 
 /*
 CEXT1(201112)
diff --git a/src/string/strlen.c b/src/string/strlen.c
index 1499eac4..f0de348f 100644
--- a/src/string/strlen.c
+++ b/src/string/strlen.c
@@ -16,7 +16,7 @@ size_t strlen(const char *s)
 	return i;
 }
 
-__check_1(size_t, 0, strlen, const char *)
+CHECK_1(size_t, 0, strlen, const char *)
 
 /***
 counts the number of bytes in the string ARGUMENT(s), not
diff --git a/src/string/strncat.c b/src/string/strncat.c
index b455a36c..563f055f 100644
--- a/src/string/strncat.c
+++ b/src/string/strncat.c
@@ -29,7 +29,7 @@ char * strncat(char * restrict s1, const char * restrict s2, size_t n)
 	return s1;
 }
 
-__check_3(char *, 0, strncat, char * restrict, const char * restrict, size_t)
+CHECK_3(char *, 0, strncat, char * restrict, const char * restrict, size_t)
 
 /***
 appends a copy of the frist ARGUMENT(n) bytes of the string
diff --git a/src/string/strncat_s.c b/src/string/strncat_s.c
index 99b3f0ad..8cc1875e 100644
--- a/src/string/strncat_s.c
+++ b/src/string/strncat_s.c
@@ -25,7 +25,7 @@ errno_t strncat_s(char * restrict s1, rsize_t s1max, const char * restrict s2, r
 	return 0;
 }
 
-__check_4(errno_t, 0, strncat_s, char * restrict, rsize_t, const char * restrict, rsize_t)
+CHECK_4(errno_t, 0, strncat_s, char * restrict, rsize_t, const char * restrict, rsize_t)
 
 /***
 The fn(strncat) function appends a copy of the frist arg(n) bytes of the string
diff --git a/src/string/strncmp.c b/src/string/strncmp.c
index 627f9c47..cf10e3f7 100644
--- a/src/string/strncmp.c
+++ b/src/string/strncmp.c
@@ -25,7 +25,7 @@ int strncmp(const char *s1, const char *s2, size_t n)
 	return memcmp(s1, s2, n);
 }
 
-__check_3(int, 0, strncmp, const char *, const char *, size_t)
+CHECK_3(int, 0, strncmp, const char *, const char *, size_t)
 
 /***
 compares up to the first ARGUMENT(n) bytes of the strings at ARGUMENT(s1) and
diff --git a/src/threads/cnd_broadcast.c b/src/threads/cnd_broadcast.c
index 5253c1e8..a1f80b48 100644
--- a/src/threads/cnd_broadcast.c
+++ b/src/threads/cnd_broadcast.c
@@ -9,7 +9,7 @@ int cnd_broadcast(cnd_t *cond)
 	return pthread_cond_broadcast(cond) == 0 ? thrd_success : thrd_error;
 }
 
-__check_1(int, 0, cnd_broadcast, cnd_t *)
+CHECK_1(int, 0, cnd_broadcast, cnd_t *)
 
 /*
 STDC(201112)
diff --git a/src/threads/cnd_init.c b/src/threads/cnd_init.c
index 94cc142f..73b62e8c 100644
--- a/src/threads/cnd_init.c
+++ b/src/threads/cnd_init.c
@@ -21,7 +21,7 @@ int cnd_init(cnd_t *cond)
 	return thrd_error;
 }
 
-__check_1(int, 0, cnd_init, cnd_t *)
+CHECK_1(int, 0, cnd_init, cnd_t *)
 
 /*
 STDC(201112)
diff --git a/src/threads/cnd_signal.c b/src/threads/cnd_signal.c
index bce158be..d80f4f30 100644
--- a/src/threads/cnd_signal.c
+++ b/src/threads/cnd_signal.c
@@ -9,7 +9,7 @@ int cnd_signal(cnd_t *cond)
 	return pthread_cond_signal(cond) == 0 ? thrd_success : thrd_error;
 }
 
-__check_1(int, 0, cnd_signal, cnd_t *)
+CHECK_1(int, 0, cnd_signal, cnd_t *)
 
 /*
 STDC(201112)
diff --git a/src/threads/cnd_timedwait.c b/src/threads/cnd_timedwait.c
index 1e86b7e5..b62cdfd6 100644
--- a/src/threads/cnd_timedwait.c
+++ b/src/threads/cnd_timedwait.c
@@ -25,7 +25,7 @@ int cnd_timedwait(cnd_t *restrict cond, mtx_t *restrict mtx, const struct timesp
 	return thrd_error;
 }
 
-__check_3(int, 0, cnd_timedwait, cnd_t * restrict, mtx_t * restrict, const struct timespec * restrict)
+CHECK_3(int, 0, cnd_timedwait, cnd_t * restrict, mtx_t * restrict, const struct timespec * restrict)
 
 /*
 STDC(201112)
diff --git a/src/threads/cnd_wait.c b/src/threads/cnd_wait.c
index bee8ff2b..2a65971a 100644
--- a/src/threads/cnd_wait.c
+++ b/src/threads/cnd_wait.c
@@ -11,7 +11,7 @@ int cnd_wait(cnd_t *cond, mtx_t *mtx)
 	return pthread_cond_wait(cond, mtx) == 0 ? thrd_success : thrd_error;
 }
 
-__check_2(int, 0, cnd_wait, cnd_t *, mtx_t *)
+CHECK_2(int, 0, cnd_wait, cnd_t *, mtx_t *)
 
 /*
 STDC(201112)
diff --git a/src/threads/mtx_init.c b/src/threads/mtx_init.c
index 43691c3d..f363b255 100644
--- a/src/threads/mtx_init.c
+++ b/src/threads/mtx_init.c
@@ -17,7 +17,7 @@ int mtx_init(mtx_t *mtx, int type)
 	return pthread_mutex_init(mtx, &attr) == 0 ? thrd_success : thrd_error;
 }
 
-__check_2(int, 0, mtx_init, mtx_t *, int)
+CHECK_2(int, 0, mtx_init, mtx_t *, int)
 
 /*
 STDC(201112)
diff --git a/src/threads/mtx_lock.c b/src/threads/mtx_lock.c
index 85b80395..131188c3 100644
--- a/src/threads/mtx_lock.c
+++ b/src/threads/mtx_lock.c
@@ -9,7 +9,7 @@ int mtx_lock(mtx_t *mtx)
 	return pthread_mutex_lock(mtx);
 }
 
-__check_1(int, 0, mtx_lock, mtx_t *)
+CHECK_1(int, 0, mtx_lock, mtx_t *)
 
 /*
 STDC(201112)
diff --git a/src/threads/mtx_timedlock.c b/src/threads/mtx_timedlock.c
index 80069bc5..ded0a41e 100644
--- a/src/threads/mtx_timedlock.c
+++ b/src/threads/mtx_timedlock.c
@@ -23,7 +23,7 @@ int mtx_timedlock(mtx_t *restrict mtx, const struct timespec *restrict ts)
 	return thrd_error;
 }
 
-__check_2(int, 0, mtx_timedlock, mtx_t * restrict, const struct timespec * restrict)
+CHECK_2(int, 0, mtx_timedlock, mtx_t * restrict, const struct timespec * restrict)
 
 /*
 STDC(201112)
diff --git a/src/threads/mtx_trylock.c b/src/threads/mtx_trylock.c
index 0dd169fa..3571504d 100644
--- a/src/threads/mtx_trylock.c
+++ b/src/threads/mtx_trylock.c
@@ -21,7 +21,7 @@ int mtx_trylock(mtx_t *mtx)
 	return thrd_error;
 }
 
-__check_1(int, 0, mtx_trylock, mtx_t *)
+CHECK_1(int, 0, mtx_trylock, mtx_t *)
 
 /*
 STDC(201112)
diff --git a/src/threads/mtx_unlock.c b/src/threads/mtx_unlock.c
index fe789420..ae7e6ec1 100644
--- a/src/threads/mtx_unlock.c
+++ b/src/threads/mtx_unlock.c
@@ -9,7 +9,7 @@ int mtx_unlock(mtx_t *mtx)
 	return pthread_mutex_unlock(mtx) == 0 ? thrd_success : thrd_error;
 }
 
-__check_1(int, 0, mtx_unlock, mtx_t *)
+CHECK_1(int, 0, mtx_unlock, mtx_t *)
 
 /*
 STDC(201112)
diff --git a/src/threads/thrd_create.c b/src/threads/thrd_create.c
index 2e6a875f..cad1b055 100644
--- a/src/threads/thrd_create.c
+++ b/src/threads/thrd_create.c
@@ -24,7 +24,7 @@ int thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
 	return thrd_error;
 }
 
-__check_3(int, 0, thrd_create, thrd_t *, thrd_start_t, void *)
+CHECK_3(int, 0, thrd_create, thrd_t *, thrd_start_t, void *)
 
 /*
 STDC(201112)
diff --git a/src/threads/thrd_current.c b/src/threads/thrd_current.c
index f18d7b29..a47d6b82 100644
--- a/src/threads/thrd_current.c
+++ b/src/threads/thrd_current.c
@@ -9,7 +9,7 @@ thrd_t thrd_current(void)
 	return pthread_self();
 }
 
-__check_0(thrd_t, 0, thrd_current)
+CHECK_0(thrd_t, 0, thrd_current)
 
 /*
 STDC(201112)
diff --git a/src/threads/thrd_detach.c b/src/threads/thrd_detach.c
index 1840abee..26a12fc2 100644
--- a/src/threads/thrd_detach.c
+++ b/src/threads/thrd_detach.c
@@ -9,7 +9,7 @@ int thrd_detach(thrd_t thr)
 	return pthread_detach(thr) == 0 ? thrd_success : thrd_error;
 }
 
-__check_1(int, 0, thrd_detach, thrd_t)
+CHECK_1(int, 0, thrd_detach, thrd_t)
 
 /*
 STDC(201112)
diff --git a/src/threads/thrd_equal.c b/src/threads/thrd_equal.c
index 7d072c2c..dd61e6c1 100644
--- a/src/threads/thrd_equal.c
+++ b/src/threads/thrd_equal.c
@@ -9,7 +9,7 @@ int thrd_equal(thrd_t thr0, thrd_t thr1)
 	return pthread_equal(thr0, thr1);
 }
 
-__check_2(int, 0, thrd_equal, thrd_t, thrd_t)
+CHECK_2(int, 0, thrd_equal, thrd_t, thrd_t)
 
 /*
 STDC(201112)
diff --git a/src/threads/thrd_join.c b/src/threads/thrd_join.c
index fef04302..f17ac010 100644
--- a/src/threads/thrd_join.c
+++ b/src/threads/thrd_join.c
@@ -9,7 +9,7 @@ int thrd_join(thrd_t thr, int *res)
 	return pthread_join(thr, (void**)&res) == 0 ? thrd_success : thrd_error;
 }
 
-__check_2(int, 0, thrd_join, thrd_t, int *)
+CHECK_2(int, 0, thrd_join, thrd_t, int *)
 
 /*
 STDC(201112)
diff --git a/src/threads/thrd_sleep.c b/src/threads/thrd_sleep.c
index 7ea445a2..a44c47e4 100644
--- a/src/threads/thrd_sleep.c
+++ b/src/threads/thrd_sleep.c
@@ -11,7 +11,7 @@ int thrd_sleep(const struct timespec *duration, struct timespec *remaining)
 	return nanosleep(duration, remaining);
 }
 
-__check_2(int, 0, thrd_sleep, const struct timespec *, struct timespec *)
+CHECK_2(int, 0, thrd_sleep, const struct timespec *, struct timespec *)
 
 /*
 STDC(201112)
diff --git a/src/threads/tss_create.c b/src/threads/tss_create.c
index e5f254e1..5844f058 100644
--- a/src/threads/tss_create.c
+++ b/src/threads/tss_create.c
@@ -9,7 +9,7 @@ int tss_create(tss_t *key, tss_dtor_t dtor)
 	return pthread_key_create(key, dtor) == 0 ? thrd_success : thrd_error;
 }
 
-__check_2(int, 0, tss_create, tss_t *, tss_dtor_t)
+CHECK_2(int, 0, tss_create, tss_t *, tss_dtor_t)
 
 /*
 STDC(201112)
diff --git a/src/threads/tss_get.c b/src/threads/tss_get.c
index 68ff5cd1..e2bce67c 100644
--- a/src/threads/tss_get.c
+++ b/src/threads/tss_get.c
@@ -9,7 +9,7 @@ void *tss_get(tss_t key)
 	return pthread_getspecific(key);
 }
 
-__check_1(void *, 0, tss_get, tss_t)
+CHECK_1(void *, 0, tss_get, tss_t)
 
 /*
 STDC(201112)
diff --git a/src/threads/tss_set.c b/src/threads/tss_set.c
index c6a09f2b..82fd88c2 100644
--- a/src/threads/tss_set.c
+++ b/src/threads/tss_set.c
@@ -9,7 +9,7 @@ int tss_set(tss_t key, void *val)
 	return pthread_setspecific(key, val) == 0 ? thrd_success : thrd_error;
 }
 
-__check_2(int, 0, tss_set, tss_t, void *)
+CHECK_2(int, 0, tss_set, tss_t, void *)
 
 /*
 STDC(201112)
diff --git a/src/time/asctime.c b/src/time/asctime.c
index d87b6d8d..f3d46fad 100644
--- a/src/time/asctime.c
+++ b/src/time/asctime.c
@@ -40,7 +40,7 @@ char * asctime(const struct tm * timeptr)
 	return result;
 }
 
-__check_1(char *, NULL, asctime, const struct tm *)
+CHECK_1(char *, NULL, asctime, const struct tm *)
 
 /***
 converts the time specified at ARGUMENT(timeptr) to a string
diff --git a/src/time/asctime_s.c b/src/time/asctime_s.c
index 84f20cc7..9aae2a62 100644
--- a/src/time/asctime_s.c
+++ b/src/time/asctime_s.c
@@ -21,7 +21,7 @@ errno_t asctime_s(char *s, rsize_t maxsize, const struct tm * timeptr)
 	return 0;
 }
 
-__check_3(errno_t, 0, asctime_s, char *, rsize_t, const struct tm *)
+CHECK_3(errno_t, 0, asctime_s, char *, rsize_t, const struct tm *)
 
 /***
 The fn(asctime) function converts the time specified at arg(timeptr) to a string
diff --git a/src/time/clock.c b/src/time/clock.c
index a1ccc29d..d9fe7951 100644
--- a/src/time/clock.c
+++ b/src/time/clock.c
@@ -9,7 +9,7 @@ clock_t clock(void)
 	return (clock_t)-1;
 }
 
-__check_0(clock_t, 0, clock)
+CHECK_0(clock_t, 0, clock)
 
 /***
 returns the amount of processor time used by the current
diff --git a/src/time/ctime.c b/src/time/ctime.c
index 47c0fdab..e841e463 100644
--- a/src/time/ctime.c
+++ b/src/time/ctime.c
@@ -14,7 +14,7 @@ char * ctime(const time_t * timer)
 	return asctime(localtime(timer));
 }
 
-__check_1(char *, NULL, ctime, const time_t *)
+CHECK_1(char *, NULL, ctime, const time_t *)
 
 /***
 converts the time at ARGUMENT(timer) to a string in the same format as
diff --git a/src/time/ctime_s.c b/src/time/ctime_s.c
index a7a68516..f54bb474 100644
--- a/src/time/ctime_s.c
+++ b/src/time/ctime_s.c
@@ -10,7 +10,7 @@ errno_t ctime_s(char *s, rsize_t maxsize, const time_t *timer)
 	return 0;
 }
 
-__check_3(errno_t, 0, ctime_s, char *, rsize_t, const time_t *)
+CHECK_3(errno_t, 0, ctime_s, char *, rsize_t, const time_t *)
 
 /***
 The fn(ctime) converts the time at arg(timer) to a string in the same format as
diff --git a/src/time/difftime.c b/src/time/difftime.c
index 640b9722..822a205d 100644
--- a/src/time/difftime.c
+++ b/src/time/difftime.c
@@ -9,7 +9,7 @@ double difftime(time_t time1, time_t time0)
 	return (double)time1 - (double)time0;
 }
 
-__check_2(double, 0.0, difftime, time_t, time_t)
+CHECK_2(double, 0.0, difftime, time_t, time_t)
 
 /***
 subtracts ARGUMENT(time0) from ARGUMENT(time1).
diff --git a/src/time/gmtime.c b/src/time/gmtime.c
index 7ce81ba2..c57ceb4b 100644
--- a/src/time/gmtime.c
+++ b/src/time/gmtime.c
@@ -51,7 +51,7 @@ struct tm * gmtime(const time_t * timer)
 	return &tm;
 }
 
-__check_1(struct tm *, 0, gmtime, const time_t *)
+CHECK_1(struct tm *, 0, gmtime, const time_t *)
 
 /***
 converts the UTC time at ARGUMENT(timer) to a filled out STRUCTDEF(tm).
diff --git a/src/time/gmtime_s.c b/src/time/gmtime_s.c
index 1e1bd6c1..54b1461f 100644
--- a/src/time/gmtime_s.c
+++ b/src/time/gmtime_s.c
@@ -11,7 +11,7 @@ struct tm * gmtime_s(const time_t * restrict timer, struct tm * restrict result)
 	return NULL;
 }
 
-__check_2(struct tm *, NULL, gmtime_s, const time_t * restrict, struct tm * restrict)
+CHECK_2(struct tm *, NULL, gmtime_s, const time_t * restrict, struct tm * restrict)
 
 /***
 The fn(gmtime) function converts the UTC time at arg(timer) to a filled out
diff --git a/src/time/localtime.c b/src/time/localtime.c
index de03da7a..3fbe174a 100644
--- a/src/time/localtime.c
+++ b/src/time/localtime.c
@@ -20,7 +20,7 @@ struct tm * localtime(const time_t * timer)
 	return &tm;
 }
 
-__check_1(struct tm *, NULL, localtime, const time_t *)
+CHECK_1(struct tm *, NULL, localtime, const time_t *)
 
 /***
 converts the locale time at ARGUMENT(timer) to a filled out STRUCTDEF(tm).
diff --git a/src/time/localtime_s.c b/src/time/localtime_s.c
index 4329e883..f6a11d67 100644
--- a/src/time/localtime_s.c
+++ b/src/time/localtime_s.c
@@ -9,7 +9,7 @@ struct tm * localtime_s(const time_t * restrict timer, struct tm * restrict resu
 	return NULL;
 }
 
-__check_2(struct tm *, NULL, localtime_s, const time_t * restrict, struct tm * restrict)
+CHECK_2(struct tm *, NULL, localtime_s, const time_t * restrict, struct tm * restrict)
 
 /***
 The fn(localtime) function converts the locale time at arg(timer) to a filled
diff --git a/src/time/mktime.c b/src/time/mktime.c
index 60a8cfc7..20b584f4 100644
--- a/src/time/mktime.c
+++ b/src/time/mktime.c
@@ -79,7 +79,7 @@ time_t mktime(struct tm * timeptr)
 		+ timeptr->tm_sec;
 }
 
-__check_1(time_t, 0, mktime, struct tm *)
+CHECK_1(time_t, 0, mktime, struct tm *)
 
 /***
 converts the local time pointed to by ARGUMENT(timeptr) to
diff --git a/src/time/strftime.c b/src/time/strftime.c
index fe3017fc..ace27f8c 100644
--- a/src/time/strftime.c
+++ b/src/time/strftime.c
@@ -156,7 +156,7 @@ size_t strftime(char * restrict s, size_t maxsize, const char * restrict format,
 	return converted;
 }
 
-__check_4(size_t, 0, strftime, char * restrict, size_t, const char * restrict, const struct tm *)
+CHECK_4(size_t, 0, strftime, char * restrict, size_t, const char * restrict, const struct tm *)
 
 /***
 converts the time at ARGUMENT(timeptr) to a string of no more than
diff --git a/src/time/time.c b/src/time/time.c
index c2a1dcc8..279f5110 100644
--- a/src/time/time.c
+++ b/src/time/time.c
@@ -21,7 +21,7 @@ time_t time(time_t * timer)
 	return (time_t)now;
 }
 
-__check_1(time_t, 0, time, time_t *)
+CHECK_1(time_t, 0, time, time_t *)
 
 /***
 gets the current time. If ARGUMENT(timer) is not CONSTANT(NULL),
diff --git a/src/time/timespec_get.c b/src/time/timespec_get.c
index 25f3a319..0fce24df 100644
--- a/src/time/timespec_get.c
+++ b/src/time/timespec_get.c
@@ -8,7 +8,7 @@ int timespec_get(struct timespec *ts, int base)
 	return base;
 }
 
-__check_2(int, 0, timespec_get, struct timespec *, int)
+CHECK_2(int, 0, timespec_get, struct timespec *, int)
 
 /*
 STDC(201112)
diff --git a/src/uchar/c16rtomb.c b/src/uchar/c16rtomb.c
index cb11c989..4cebf5af 100644
--- a/src/uchar/c16rtomb.c
+++ b/src/uchar/c16rtomb.c
@@ -11,7 +11,7 @@ size_t c16rtomb(char * restrict s, char16_t c16, mbstate_t * restrict ps)
 	return 0;
 }
 
-__check_3(size_t, 0, c16rtomb, char * restrict, char16_t, mbstate_t * restrict)
+CHECK_3(size_t, 0, c16rtomb, char * restrict, char16_t, mbstate_t * restrict)
 
 /*
 STDC(201112)
diff --git a/src/uchar/c32rtomb.c b/src/uchar/c32rtomb.c
index 34061679..1199d210 100644
--- a/src/uchar/c32rtomb.c
+++ b/src/uchar/c32rtomb.c
@@ -11,7 +11,7 @@ size_t c32rtomb(char * restrict s, char32_t c32, mbstate_t * restrict ps)
 	return 0;
 }
 
-__check_3(size_t, 0, c32rtomb, char * restrict, char32_t, mbstate_t * restrict)
+CHECK_3(size_t, 0, c32rtomb, char * restrict, char32_t, mbstate_t * restrict)
 
 /*
 STDC(201112)
diff --git a/src/uchar/mbrtoc16.c b/src/uchar/mbrtoc16.c
index 786880b2..86908f95 100644
--- a/src/uchar/mbrtoc16.c
+++ b/src/uchar/mbrtoc16.c
@@ -11,7 +11,7 @@ size_t mbrtoc16(char16_t * restrict pc16, const char * restrict s, size_t n, mbs
 	return 0;
 }
 
-__check_4(size_t, 0, mbrtoc16, char16_t * restrict, const char * restrict, size_t, mbstate_t * restrict)
+CHECK_4(size_t, 0, mbrtoc16, char16_t * restrict, const char * restrict, size_t, mbstate_t * restrict)
 
 /*
 STDC(201112)
diff --git a/src/uchar/mbrtoc32.c b/src/uchar/mbrtoc32.c
index c4e4fc75..c4ed7f88 100644
--- a/src/uchar/mbrtoc32.c
+++ b/src/uchar/mbrtoc32.c
@@ -11,7 +11,7 @@ size_t mbrtoc32(char32_t * restrict pc32, const char * restrict s, size_t n, mbs
 	return 0;
 }
 
-__check_4(size_t, 0, mbrtoc32, char32_t * restrict, const char * restrict, size_t, mbstate_t * restrict)
+CHECK_4(size_t, 0, mbrtoc32, char32_t * restrict, const char * restrict, size_t, mbstate_t * restrict)
 
 /*
 STDC(201112)
diff --git a/src/wctype/iswalnum.c b/src/wctype/iswalnum.c
index 98c2f08c..c63afc08 100644
--- a/src/wctype/iswalnum.c
+++ b/src/wctype/iswalnum.c
@@ -12,7 +12,7 @@ int iswalnum(wint_t wc)
 	return iswalpha(wc) || iswdigit(wc);
 }
 
-__check_1(int, 0, iswalnum, wint_t)
+CHECK_1(int, 0, iswalnum, wint_t)
 
 /***
 The fn(iswalnum) function tests whether arg(wc) is a wide character in the class
diff --git a/src/wctype/iswalpha.c b/src/wctype/iswalpha.c
index 8300b7ea..86e81d67 100644
--- a/src/wctype/iswalpha.c
+++ b/src/wctype/iswalpha.c
@@ -12,7 +12,7 @@ int iswalpha(wint_t wc)
 	return iswctype(wc, alpha);
 }
 
-__check_1(int, 0, iswalpha, wint_t)
+CHECK_1(int, 0, iswalpha, wint_t)
 
 /***
 The fn(iswalpha) function tests whether arg(wc) is a wide character in the class
diff --git a/src/wctype/iswblank.c b/src/wctype/iswblank.c
index 2e0f0724..7699873f 100644
--- a/src/wctype/iswblank.c
+++ b/src/wctype/iswblank.c
@@ -11,7 +11,7 @@ int iswblank(wint_t wc)
 	return iswctype(wc, blank);
 }
 
-__check_1(int, 0, iswblank, wint_t)
+CHECK_1(int, 0, iswblank, wint_t)
 
 /***
 The fn(iswblank) functions tests whether a wide character is a of the character
diff --git a/src/wctype/iswcntrl.c b/src/wctype/iswcntrl.c
index de6dd237..ef18c7c4 100644
--- a/src/wctype/iswcntrl.c
+++ b/src/wctype/iswcntrl.c
@@ -12,7 +12,7 @@ int iswcntrl(wint_t wc)
 	return iswctype(wc, cntrl);
 }
 
-__check_1(int, 0, iswcntrl, wint_t)
+CHECK_1(int, 0, iswcntrl, wint_t)
 
 /***
 The fn(iswcntrl) function tests whether arg(wc) is a wide character in the class
diff --git a/src/wctype/iswctype.c b/src/wctype/iswctype.c
index 8ce67657..b1d1a3a1 100644
--- a/src/wctype/iswctype.c
+++ b/src/wctype/iswctype.c
@@ -15,7 +15,7 @@ int iswctype(wint_t wc, wctype_t desc)
 	return 0;
 }
 
-__check_2(int, 0, iswctype, wint_t, wctype_t)
+CHECK_2(int, 0, iswctype, wint_t, wctype_t)
 
 /***
 The fn(iswctype) function tests whether arg(wc) is a wide character in the
diff --git a/src/wctype/iswdigit.c b/src/wctype/iswdigit.c
index 94feb0a3..aab43ffe 100644
--- a/src/wctype/iswdigit.c
+++ b/src/wctype/iswdigit.c
@@ -12,7 +12,7 @@ int iswdigit(wint_t wc)
 	return iswctype(wc, digit);
 }
 
-__check_1(int, 0, iswdigit, wint_t)
+CHECK_1(int, 0, iswdigit, wint_t)
 
 /***
 The fn(iswdigit) function tests whether arg(wc) is a wide character in the class
diff --git a/src/wctype/iswgraph.c b/src/wctype/iswgraph.c
index 346af2b1..9c9b60b7 100644
--- a/src/wctype/iswgraph.c
+++ b/src/wctype/iswgraph.c
@@ -12,7 +12,7 @@ int iswgraph(wint_t wc)
 	return iswctype(wc, graph);
 }
 
-__check_1(int, 0, iswgraph, wint_t)
+CHECK_1(int, 0, iswgraph, wint_t)
 
 /***
 The fn(iswgraph) function tests whether arg(wc) is a wide character in the class
diff --git a/src/wctype/iswlower.c b/src/wctype/iswlower.c
index ec3a59a3..113a0f15 100644
--- a/src/wctype/iswlower.c
+++ b/src/wctype/iswlower.c
@@ -12,7 +12,7 @@ int iswlower(wint_t wc)
 	return iswctype(wc, lower);
 }
 
-__check_1(int, 0, iswlower, wint_t)
+CHECK_1(int, 0, iswlower, wint_t)
 
 /***
 The fn(iswlower) function tests whether arg(wc) is a wide character in the class
diff --git a/src/wctype/iswprint.c b/src/wctype/iswprint.c
index 8d6ec64a..4111607b 100644
--- a/src/wctype/iswprint.c
+++ b/src/wctype/iswprint.c
@@ -12,7 +12,7 @@ int iswprint(wint_t wc)
 	return iswctype(wc, print);
 }
 
-__check_1(int, 0, iswprint, wint_t)
+CHECK_1(int, 0, iswprint, wint_t)
 
 /***
 The fn(iswprint) function tests whether arg(wc) is a character in the class
diff --git a/src/wctype/iswpunct.c b/src/wctype/iswpunct.c
index 831448db..7e07c5c7 100644
--- a/src/wctype/iswpunct.c
+++ b/src/wctype/iswpunct.c
@@ -12,7 +12,7 @@ int iswpunct(wint_t wc)
 	return iswctype(wc, punct);
 }
 
-__check_1(int, 0, iswpunct, wint_t)
+CHECK_1(int, 0, iswpunct, wint_t)
 
 /***
 The fn(iswpunct) function tests whether arg(wc) is a character in the class
diff --git a/src/wctype/iswspace.c b/src/wctype/iswspace.c
index c95a4e1d..a6a05619 100644
--- a/src/wctype/iswspace.c
+++ b/src/wctype/iswspace.c
@@ -12,7 +12,7 @@ int iswspace(wint_t wc)
 	return iswctype(wc, space);
 }
 
-__check_1(int, 0, iswspace, wint_t)
+CHECK_1(int, 0, iswspace, wint_t)
 
 /***
 The fn(iswspace) function tests whether arg(wc) is a wide character in the class
diff --git a/src/wctype/iswupper.c b/src/wctype/iswupper.c
index 7c9faa9c..41684dc0 100644
--- a/src/wctype/iswupper.c
+++ b/src/wctype/iswupper.c
@@ -12,7 +12,7 @@ int iswupper(wint_t wc)
 	return iswctype(wc, upper);
 }
 
-__check_1(int, 0, iswupper, wint_t)
+CHECK_1(int, 0, iswupper, wint_t)
 
 /***
 The fn(iswupper) function tests whether arg(wc) is a wide character in the class
diff --git a/src/wctype/iswxdigit.c b/src/wctype/iswxdigit.c
index bbb669ca..d4e54921 100644
--- a/src/wctype/iswxdigit.c
+++ b/src/wctype/iswxdigit.c
@@ -12,7 +12,7 @@ int iswxdigit(wint_t wc)
 	return iswctype(wc, xdigit);
 }
 
-__check_1(int, 0, iswxdigit, wint_t)
+CHECK_1(int, 0, iswxdigit, wint_t)
 
 /***
 The fn(iswxdigit) function tests whether arg(wc) is a wide character in the
diff --git a/src/wctype/towctrans.c b/src/wctype/towctrans.c
index 0c3d9a06..8e6d266c 100644
--- a/src/wctype/towctrans.c
+++ b/src/wctype/towctrans.c
@@ -14,7 +14,7 @@ wint_t towctrans(wint_t wc, wctrans_t desc)
 	return 0;
 }
 
-__check_2(wint_t, 0, towctrans, wint_t, wctrans_t)
+CHECK_2(wint_t, 0, towctrans, wint_t, wctrans_t)
 
 /***
 The fn(towctrans) function translates the wide character arg(wc) according to
diff --git a/src/wctype/towlower.c b/src/wctype/towlower.c
index 8fa94e5a..0bcd7ec6 100644
--- a/src/wctype/towlower.c
+++ b/src/wctype/towlower.c
@@ -17,7 +17,7 @@ wint_t towlower(wint_t wc)
 	return towctrans(wc, trans);
 }
 
-__check_1(wint_t, 0, towlower, wint_t)
+CHECK_1(wint_t, 0, towlower, wint_t)
 
 /***
 The fn(towlower) function converts a wide uppercase letter to its equivalent
diff --git a/src/wctype/towupper.c b/src/wctype/towupper.c
index 1c819c32..eb81b140 100644
--- a/src/wctype/towupper.c
+++ b/src/wctype/towupper.c
@@ -16,7 +16,7 @@ wint_t towupper(wint_t wc)
 	return towctrans(wc, trans);
 }
 
-__check_1(wint_t, 0, towupper, wint_t)
+CHECK_1(wint_t, 0, towupper, wint_t)
 
 /***
 The fn(towupper) function converts a wide lowercase letter to its equivalent
diff --git a/src/wctype/wctrans.c b/src/wctype/wctrans.c
index 9fc08884..aa47d945 100644
--- a/src/wctype/wctrans.c
+++ b/src/wctype/wctrans.c
@@ -17,7 +17,7 @@ wctrans_t wctrans(const char * property)
 	return 0;
 }
 
-__check_1(wctrans_t, 0, wctrans, const char *)
+CHECK_1(wctrans_t, 0, wctrans, const char *)
 
 /***
 The fn(wctrans) function looks up the wide character translation mapping
diff --git a/src/wctype/wctype.c b/src/wctype/wctype.c
index 767025e0..2dd4599f 100644
--- a/src/wctype/wctype.c
+++ b/src/wctype/wctype.c
@@ -37,7 +37,7 @@ wctype_t wctype(const char * property)
 	return 0;
 }
 
-__check_1(wctype_t, 0, wctype, const char *)
+CHECK_1(wctype_t, 0, wctype, const char *)
 
 /***
 The fn(wctype) function looks up the character class specified by the string