prefix arguments with __

48 files changed, 92 insertions, 73 deletions

diff --git a/src/ctype/_tolower.c b/src/ctype/_tolower.c
index 2e656b6e..461e4402 100644
--- a/src/ctype/_tolower.c
+++ b/src/ctype/_tolower.c
@@ -2,7 +2,7 @@
 
 /** convert an uppercase letter to lowercase **/
 
-#define _tolower(c)                                                   tolower(c)
+#define _tolower(__c)                                               tolower(__c)
 
 /***
 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 7c284981..65c6c37a 100644
--- a/src/ctype/_toupper.c
+++ b/src/ctype/_toupper.c
@@ -2,7 +2,7 @@
 
 /** convert a lowercase letter to uppercase **/
 
-#define _toupper(c)                                                   toupper(c)
+#define _toupper(__c)                                               toupper(__c)
 
 /***
 converts a lowercase letter to its equivalent uppercase letter in the current
diff --git a/src/curses/COLOR_PAIR.c b/src/curses/COLOR_PAIR.c
index 6a8fe9fb..e664a419 100644
--- a/src/curses/COLOR_PAIR.c
+++ b/src/curses/COLOR_PAIR.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#define COLOR_PAIR(n) /* TODO */
+#define COLOR_PAIR(__n) /* TODO */
 /*
 XOPEN(400)
 LINK(curses)
diff --git a/src/curses/PAIR_NUMBER.c b/src/curses/PAIR_NUMBER.c
index d2704e38..183a6ed7 100644
--- a/src/curses/PAIR_NUMBER.c
+++ b/src/curses/PAIR_NUMBER.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#define PAIR_NUMBER(value) /* TODO */
+#define PAIR_NUMBER(__value) /* TODO */
 /*
 XOPEN(400)
 LINK(curses)
diff --git a/src/math/_tgmath.h b/src/math/_tgmath.h
index fa7ce4b4..950fbdee 100644
--- a/src/math/_tgmath.h
+++ b/src/math/_tgmath.h
@@ -5,20 +5,20 @@
 #ifdef TGSOURCE
 
 # if (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L)
-#  define TGCMPLX(x,y)	CMPLXF(x,y)
-#  define TGFN(x)	x##f
-#  define TYPE		float
-#  define TGHUGE	HUGE_VALF
+#  define TGCMPLX(__x, __y)	CMPLXF(__x, __y)
+#  define TGFN(__x)		__x##f
+#  define TYPE			float
+#  define TGHUGE		HUGE_VALF
 #  include TGSOURCE
 #  undef TGCMPLX
 #  undef TGFN
 #  undef TYPE
 #  undef TGHUGE
 
-#  define TGCMPLX(x,y)  CMPLXL(x,y)
-#  define TGFN(x)	x##l
-#  define TYPE		long double
-#  define TGHUGE	HUGE_VALL
+#  define TGCMPLX(__x, __y)	CMPLXL(__x, __y)
+#  define TGFN(__x)		__x##l
+#  define TYPE			long double
+#  define TGHUGE		HUGE_VALL
 #  include TGSOURCE
 #  undef TGCMPLX
 #  undef TGFN
@@ -28,9 +28,9 @@
 
 #endif
 
-#define TGCMPLX(x,y) CMPLX(x,y)
-#define TGFN(x)	x
-#define TYPE	double
-#define TGHUGE	HUGE_VAL
+#define TGCMPLX(__x, __y)	CMPLX(__x, __y)
+#define TGFN(__x)		__x
+#define TYPE			double
+#define TGHUGE			HUGE_VAL
 
 #endif
diff --git a/src/math/fpclassify.c b/src/math/fpclassify.c
index 2e040e41..131905af 100644
--- a/src/math/fpclassify.c
+++ b/src/math/fpclassify.c
@@ -1,7 +1,9 @@
 #include <math.h>
 
-#define fpclassify(x)    ((sizeof (x) == sizeof (float)) ? __fpclassifyf(x) : \
-	(sizeof (x) == sizeof (double)) ? __fpclassify(x) :  __fpclassifyl(x))
+#define fpclassify(__x) \
+	              ((sizeof (__x) == sizeof (float)) ? __fpclassifyf(__x) : \
+		       (sizeof (__x) == sizeof (double)) ? __fpclassify(__x) : \
+		                                          __fpclassifyl(__x))
 
 /*
 STDC(199901)
diff --git a/src/math/isfinite.c b/src/math/isfinite.c
index 5eaf6b06..a37b5a2d 100644
--- a/src/math/isfinite.c
+++ b/src/math/isfinite.c
@@ -1,6 +1,6 @@
 #include <math.h>
 
-#define isfinite(x)                               (fpclassify(x) != FP_INFINITE)
+#define isfinite(__x)                           (fpclassify(__x) != FP_INFINITE)
 
 /*
 STDC(199901)
diff --git a/src/math/isgreater.c b/src/math/isgreater.c
index 672dbe6a..80344c03 100644
--- a/src/math/isgreater.c
+++ b/src/math/isgreater.c
@@ -1,5 +1,6 @@
 #include <math.h>
-#define isgreater(x,y)                                               ((x) > (y))
+
+#define isgreater(__x, __y)                                      ((__x) > (__y))
 
 /*
 STDC(199901)
diff --git a/src/math/isgreaterequal.c b/src/math/isgreaterequal.c
index de0eaaf2..acc5d937 100644
--- a/src/math/isgreaterequal.c
+++ b/src/math/isgreaterequal.c
@@ -1,5 +1,6 @@
 #include <math.h>
-#define isgreaterequal(x,y)                                         ((x) >= (y))
+
+#define isgreaterequal(__x, __y)                                ((__x) >= (__y))
 
 /*
 STDC(199901)
diff --git a/src/math/isinf.c b/src/math/isinf.c
index 1a6b00ff..be76ecfb 100644
--- a/src/math/isinf.c
+++ b/src/math/isinf.c
@@ -1,6 +1,6 @@
 #include <math.h>
 
-#define isinf(x)                                  (fpclassify(x) == FP_INFINITE)
+#define isinf(__x)                              (fpclassify(__x) == FP_INFINITE)
 
 /*
 STDC(199901)
diff --git a/src/math/isless.c b/src/math/isless.c
index 9685e84a..66f7d939 100644
--- a/src/math/isless.c
+++ b/src/math/isless.c
@@ -1,5 +1,6 @@
 #include <math.h>
-#define isless(x,y)                                                  ((x) < (y))
+
+#define isless(__x, __y)                                         ((__x) < (__y))
 
 /*
 STDC(199901)
diff --git a/src/math/islessequal.c b/src/math/islessequal.c
index 97ded436..34a1c138 100644
--- a/src/math/islessequal.c
+++ b/src/math/islessequal.c
@@ -1,5 +1,6 @@
 #include <math.h>
-#define islessequal(x,y)                                            ((x) <= (y))
+
+#define islessequal(__x, __y)                                   ((__x) <= (__y))
 
 /*
 STDC(199901)
diff --git a/src/math/islessgreater.c b/src/math/islessgreater.c
index a2566474..b17fb161 100644
--- a/src/math/islessgreater.c
+++ b/src/math/islessgreater.c
@@ -1,5 +1,6 @@
 #include <math.h>
-#define islessgreater(x,y)                              ((x) < (y) || (x) > (y))
+
+#define islessgreater(__x, __y)                 ((__x) < (__y) || (__x) > (__y))
 
 /*
 STDC(199901)
diff --git a/src/math/isnan.c b/src/math/isnan.c
index e3e0160a..80bbb741 100644
--- a/src/math/isnan.c
+++ b/src/math/isnan.c
@@ -1,5 +1,6 @@
 #include <math.h>
-#define isnan(x)                                       (fpclassify(x) == FP_NAN)
+
+#define isnan(__x)                                   (fpclassify(__x) == FP_NAN)
 
 /*
 STDC(199901)
diff --git a/src/math/isnormal.c b/src/math/isnormal.c
index 868c7ea2..95e82b1b 100644
--- a/src/math/isnormal.c
+++ b/src/math/isnormal.c
@@ -1,6 +1,6 @@
 #include <math.h>
 
-#define isnormal(x)                                 (fpclassify(x) == FP_NORMAL)
+#define isnormal(__x)                             (fpclassify(__x) == FP_NORMAL)
 
 /*
 STDC(199901)
diff --git a/src/math/isunordered.c b/src/math/isunordered.c
index ac8cbfff..dab6fe64 100644
--- a/src/math/isunordered.c
+++ b/src/math/isunordered.c
@@ -1,5 +1,6 @@
 #include <math.h>
-#define isunordered(x,y)                                              /* TODO */
+
+#define isunordered(__x, __y)                                         /* TODO */
 
 /*
 STDC(199901)
diff --git a/src/math/signbit.c b/src/math/signbit.c
index a5278e77..77cc3977 100644
--- a/src/math/signbit.c
+++ b/src/math/signbit.c
@@ -1,20 +1,20 @@
 #include <math.h>
 
-#define signbit(x) \
-	(sizeof(x) == sizeof(long double) ? \
+#define signbit(__x) \
+	(sizeof(__x) == sizeof(long double) ? \
 		((((union { \
 			long double __f; \
-			char __c[sizeof(x)]; \
-		}){.__f = (x)}).__c[sizeof(x)-1] & 0x80) == 0x80 ? 1 : 0) : \
-	sizeof(x) == sizeof(double) ? \
+			char __c[sizeof(__x)]; \
+		}){.__f = (__x)}).__c[sizeof(__x)-1] & 0x80) == 0x80 ? 1 : 0) : \
+	sizeof(__x) == sizeof(double) ? \
 		((((union { \
 			double __f; \
-			char __c[sizeof(x)]; \
-		}){.__f = (x)}).__c[sizeof(x)-1] & 0x80) == 0x80 ? 1 : 0) : \
+			char __c[sizeof(__x)]; \
+		}){.__f = (__x)}).__c[sizeof(__x)-1] & 0x80) == 0x80 ? 1 : 0) : \
 		(((union { \
 			float __f; \
-			char __c[sizeof(x)]; \
-		}){.__f = (x)}).__c[sizeof(x)-1] & 0x80) == 0x80 ? 1 : 0)
+			char __c[sizeof(__x)]; \
+		}){.__f = (__x)}).__c[sizeof(__x)-1] & 0x80) == 0x80 ? 1 : 0)
 
 
 /*
diff --git a/src/nonstd/ASSERT_NONNULL.c b/src/nonstd/ASSERT_NONNULL.c
index e65020fd..26a6138e 100644
--- a/src/nonstd/ASSERT_NONNULL.c
+++ b/src/nonstd/ASSERT_NONNULL.c
@@ -1,12 +1,12 @@
 #include <nonstd/assert.h>
 
 #ifndef NDEBUG
-#define ASSERT_NONNULL(_ptr) do { \
-	if (!_ptr) { \
+#define ASSERT_NONNULL(__ptr) do { \
+	if (!__ptr) { \
 		struct __constraint_info _ci = {0}; \
 		_ci.func = __func__; \
 		__libc.stdlib.constraint_handler("Undefined behavior: " \
-			"Parameter " #_ptr " can not be NULL", &_ci, EFAULT); \
+			"Parameter " #__ptr " can not be NULL", &_ci, EFAULT); \
 	} \
 	} while (0)
 #else
diff --git a/src/nonstd/ASSERT_NONZERO.c b/src/nonstd/ASSERT_NONZERO.c
index 24a3f9a9..e48e775a 100644
--- a/src/nonstd/ASSERT_NONZERO.c
+++ b/src/nonstd/ASSERT_NONZERO.c
@@ -1,12 +1,12 @@
 #include <nonstd/assert.h>
 
 #ifndef NDEBUG
-#define ASSERT_NONZERO(_n) do { \
-	if (!_n) { \
+#define ASSERT_NONZERO(__n) do { \
+	if (!__n) { \
 		struct __constraint_info _ci = {0}; \
 		_ci.func = __func__; \
 		__libc.stdlib.constraint_handler("Undefined behavior: " \
-			"Parameter " #_n " can not be 0", &_ci, ERANGE); \
+			"Parameter " #__n " can not be 0", &_ci, ERANGE); \
 	} \
 	} while (0)
 #else
diff --git a/src/nonstd/ASSERT_NOOVERLAP.c b/src/nonstd/ASSERT_NOOVERLAP.c
index 5157c6d3..7173752d 100644
--- a/src/nonstd/ASSERT_NOOVERLAP.c
+++ b/src/nonstd/ASSERT_NOOVERLAP.c
@@ -1,9 +1,9 @@
 #include <nonstd/assert.h>
 
 #ifndef NDEBUG
-#define ASSERT_NOOVERLAP(x, y, s) do { \
+#define ASSERT_NOOVERLAP(__x, __y, __s) do { \
 	/* TODO */ \
 	} while (0)
 #else
-#define ASSERT_NOOVERLAP(x, y, s)
+#define ASSERT_NOOVERLAP(__x, __y, __s)
 #endif
diff --git a/src/nonstd/flockfile.c b/src/nonstd/flockfile.c
index 54c86a36..021c73c3 100644
--- a/src/nonstd/flockfile.c
+++ b/src/nonstd/flockfile.c
@@ -1,5 +1,5 @@
 #include <nonstd/io.h>
 
 #if !(defined _POSIX_C_SOURCE && 199506L <= _POSIX_C_SOURCE) && !(defined _XOPEN_SOURCE && 500 <= _XOPEN_SOURCE)
-#define flockfile(f) (void)(f)
+#define flockfile(__f) (void)(__f)
 #endif
diff --git a/src/nonstd/ftrylockfile.c b/src/nonstd/ftrylockfile.c
index 61636a7e..b805a6e5 100644
--- a/src/nonstd/ftrylockfile.c
+++ b/src/nonstd/ftrylockfile.c
@@ -1,5 +1,5 @@
 #include <nonstd/io.h>
 
 #if !(defined _POSIX_C_SOURCE && 199506L <= _POSIX_C_SOURCE) && !(defined _XOPEN_SOURCE && 500 <= _XOPEN_SOURCE)
-#define ftrylockfile(f) (void)(f), 0
+#define ftrylockfile(__f) (void)(__f), 0
 #endif
diff --git a/src/nonstd/funlockfile.c b/src/nonstd/funlockfile.c
index 0fe52c48..ab67117f 100644
--- a/src/nonstd/funlockfile.c
+++ b/src/nonstd/funlockfile.c
@@ -1,5 +1,5 @@
 #include <nonstd/io.h>
 
 #if !(defined _POSIX_C_SOURCE && 199506L <= _POSIX_C_SOURCE) && !(defined _XOPEN_SOURCE && 500 <= _XOPEN_SOURCE)
-#define funlockfile(f) (void)(f)
+#define funlockfile(__f) (void)(__f)
 #endif
diff --git a/src/nonstd/getc_unlocked.c b/src/nonstd/getc_unlocked.c
index a575e60a..fb700587 100644
--- a/src/nonstd/getc_unlocked.c
+++ b/src/nonstd/getc_unlocked.c
@@ -1,5 +1,5 @@
 #include <nonstd/io.h>
 
 #if !(defined _POSIX_C_SOURCE && 199506L <= _POSIX_C_SOURCE) && !(defined _XOPEN_SOURCE && 500 <= _XOPEN_SOURCE)
-#define getc_unlocked(f) getc(f)
+#define getc_unlocked(__f) getc(__f)
 #endif
diff --git a/src/stdarg/va_arg.c b/src/stdarg/va_arg.c
index 0367c7b1..4ea41019 100644
--- a/src/stdarg/va_arg.c
+++ b/src/stdarg/va_arg.c
@@ -2,7 +2,7 @@
 
 /** get an unnamed parameter **/
 
-#define va_arg(ap, type)                              __builtin_va_arg(ap, type)
+#define va_arg(__ap, __type)                      __builtin_va_arg(__ap, __type)
 
 /***
 retrieves the next unnamed parameter for use. The ARGUMENT(ap) parameter must
diff --git a/src/stdarg/va_copy.c b/src/stdarg/va_copy.c
index d9222ff4..ad49c5c9 100644
--- a/src/stdarg/va_copy.c
+++ b/src/stdarg/va_copy.c
@@ -2,7 +2,7 @@
 
 /** copy a va_list **/
 
-#define va_copy(dest, src)                          __builtin_va_copy(dest, src)
+#define va_copy(__dest, __src)                  __builtin_va_copy(__dest, __src)
 
 /***
 copies the TYPE(va_list) ARGUMENT(src) to ARGUMENT(dest), including the current
diff --git a/src/stdarg/va_end.c b/src/stdarg/va_end.c
index 2934e600..dd1c04ab 100644
--- a/src/stdarg/va_end.c
+++ b/src/stdarg/va_end.c
@@ -2,7 +2,7 @@
 
 /** end processing unnamed arguments **/
 
-#define va_end(ap)                                          __builtin_va_end(ap)
+#define va_end(__ap)                                      __builtin_va_end(__ap)
 
 /***
 stops processing unnamed arguments that were previously begun with a call to
diff --git a/src/stdarg/va_start.c b/src/stdarg/va_start.c
index 82a0ea3f..69c418a1 100644
--- a/src/stdarg/va_start.c
+++ b/src/stdarg/va_start.c
@@ -2,7 +2,7 @@
 
 /** begin processing unnamed arguments **/
 
-#define va_start(ap, parmN)                        __builtin_va_start(ap, parmN)
+#define va_start(__ap, __parmN)                __builtin_va_start(__ap, __parmN)
 
 /***
 prepares unnamed arguments for use. It initializes ARGUMENT(ap) with the the
diff --git a/src/stdint/INT16_C.c b/src/stdint/INT16_C.c
index 59f6e911..ebad0207 100644
--- a/src/stdint/INT16_C.c
+++ b/src/stdint/INT16_C.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
-#define INT16_C(value)                                    ((int_least16_t)value)
+
+#define INT16_C(__value)                                ((int_least16_t)__value)
 
 /*
 STDC(199901)
diff --git a/src/stdint/INT32_C.c b/src/stdint/INT32_C.c
index fca867f9..9e052968 100644
--- a/src/stdint/INT32_C.c
+++ b/src/stdint/INT32_C.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
-#define INT32_C(value)                                 ((int_least32_t)value##L)
+
+#define INT32_C(__value)                             ((int_least32_t)__value##L)
 
 /*
 STDC(199901)
diff --git a/src/stdint/INT64_C.c b/src/stdint/INT64_C.c
index ee8fdafa..c62410d6 100644
--- a/src/stdint/INT64_C.c
+++ b/src/stdint/INT64_C.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
-#define INT64_C(value)                                ((int_least64_t)value##LL)
+
+#define INT64_C(__value)                            ((int_least64_t)__value##LL)
 
 /*
 STDC(199901)
diff --git a/src/stdint/INT8_C.c b/src/stdint/INT8_C.c
index 58135cb6..0c7f1550 100644
--- a/src/stdint/INT8_C.c
+++ b/src/stdint/INT8_C.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
-#define INT8_C(value)                                      ((int_least8_t)value)
+
+#define INT8_C(__value)                                  ((int_least8_t)__value)
 
 /*
 STDC(199901)
diff --git a/src/stdint/INTMAX_C.c b/src/stdint/INTMAX_C.c
index c051c9ae..2cf10573 100644
--- a/src/stdint/INTMAX_C.c
+++ b/src/stdint/INTMAX_C.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
-#define INTMAX_C(value)                                    ((intmax_t)value##LL)
+
+#define INTMAX_C(__value)                                ((intmax_t)__value##LL)
 
 /*
 STDC(199901)
diff --git a/src/stdint/UINT16_C.c b/src/stdint/UINT16_C.c
index dbb276a6..afbcc96c 100644
--- a/src/stdint/UINT16_C.c
+++ b/src/stdint/UINT16_C.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
-#define UINT16_C(value)                                  ((uint_least16_t)value)
+
+#define UINT16_C(__value)                              ((uint_least16_t)__value)
 
 /*
 STDC(199901)
diff --git a/src/stdint/UINT32_C.c b/src/stdint/UINT32_C.c
index 05583780..fd310c88 100644
--- a/src/stdint/UINT32_C.c
+++ b/src/stdint/UINT32_C.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
-#define UINT32_C(value)                               ((uint_least32_t)value##U)
+
+#define UINT32_C(__value)                           ((uint_least32_t)__value##U)
 
 /*
 STDC(199901)
diff --git a/src/stdint/UINT64_C.c b/src/stdint/UINT64_C.c
index ce05a6bc..4d084517 100644
--- a/src/stdint/UINT64_C.c
+++ b/src/stdint/UINT64_C.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
-#define UINT64_C(value)                             ((uint_least32_t)value##ULL)
+
+#define UINT64_C(__value)                         ((uint_least32_t)__value##ULL)
 
 /*
 STDC(199901)
diff --git a/src/stdint/UINT8_C.c b/src/stdint/UINT8_C.c
index 93e7ccc5..5d269bb7 100644
--- a/src/stdint/UINT8_C.c
+++ b/src/stdint/UINT8_C.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
-#define UINT8_C(value)                                    ((uint_least8_t)value)
+
+#define UINT8_C(__value)                                ((uint_least8_t)__value)
 
 /*
 STDC(199901)
diff --git a/src/stdint/UINTMAX_C.c b/src/stdint/UINTMAX_C.c
index d505d108..00b10906 100644
--- a/src/stdint/UINTMAX_C.c
+++ b/src/stdint/UINTMAX_C.c
@@ -1,5 +1,6 @@
 #include <stdint.h>
-#define UINTMAX_C(value)                                 ((uintmax_t)value##ULL)
+
+#define UINTMAX_C(__value)                             ((uintmax_t)__value##ULL)
 
 /*
 STDC(199901)
diff --git a/src/sys/stat/S_ISBLK.c b/src/sys/stat/S_ISBLK.c
index b2d0031b..2cb951f9 100644
--- a/src/sys/stat/S_ISBLK.c
+++ b/src/sys/stat/S_ISBLK.c
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#define S_ISBLK(s)                                    /* FIXME */
+#define S_ISBLK(__s)                                    /* FIXME */
 /*
 POSIX(1)
 */
diff --git a/src/sys/stat/S_ISCHR.c b/src/sys/stat/S_ISCHR.c
index a393b84e..91a19e27 100644
--- a/src/sys/stat/S_ISCHR.c
+++ b/src/sys/stat/S_ISCHR.c
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#define S_ISCHR(s)          /* fixme */
+#define S_ISCHR(__s)          /* fixme */
 /*
 POSIX(1)
 */
diff --git a/src/sys/stat/S_ISDIR.c b/src/sys/stat/S_ISDIR.c
index 5b5720c7..b23e06bf 100644
--- a/src/sys/stat/S_ISDIR.c
+++ b/src/sys/stat/S_ISDIR.c
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#define S_ISDIR(s) (s)
+#define S_ISDIR(__s) (__s)
 /*
 POSIX(1)
 */
diff --git a/src/sys/stat/S_ISFIFO.c b/src/sys/stat/S_ISFIFO.c
index a28a90e9..80aac6c5 100644
--- a/src/sys/stat/S_ISFIFO.c
+++ b/src/sys/stat/S_ISFIFO.c
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#define S_ISFIFO(s) /* fixme */
+#define S_ISFIFO(__s) /* fixme */
 /*
 POSIX(1)
 */
diff --git a/src/sys/stat/S_ISLNK.c b/src/sys/stat/S_ISLNK.c
index b5578adc..232bf06b 100644
--- a/src/sys/stat/S_ISLNK.c
+++ b/src/sys/stat/S_ISLNK.c
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#define S_ISLNK(m) /* TODO */
+#define S_ISLNK(__m) /* TODO */
 /*
 XOPEN(400)
 POSIX(200112)
diff --git a/src/sys/stat/S_ISREG.c b/src/sys/stat/S_ISREG.c
index 7a09ffe5..99b470c1 100644
--- a/src/sys/stat/S_ISREG.c
+++ b/src/sys/stat/S_ISREG.c
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#define S_ISREG(s) /* fixme */
+#define S_ISREG(__s) /* fixme */
 /*
 POSIX(1)
 */
diff --git a/src/sys/stat/S_TYPEISMQ.c b/src/sys/stat/S_TYPEISMQ.c
index cb15b80a..064e9f6a 100644
--- a/src/sys/stat/S_TYPEISMQ.c
+++ b/src/sys/stat/S_TYPEISMQ.c
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#define S_TYPEISMQ(buf) /* TODO */
+#define S_TYPEISMQ(__buf) /* TODO */
 /*
 POSIX(199309)
 */
diff --git a/src/sys/stat/S_TYPEISSEM.c b/src/sys/stat/S_TYPEISSEM.c
index 60dd471d..4fb0f690 100644
--- a/src/sys/stat/S_TYPEISSEM.c
+++ b/src/sys/stat/S_TYPEISSEM.c
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#define S_TYPEISSEM(buf) /* TODO */
+#define S_TYPEISSEM(__buf) /* TODO */
 /*
 POSIX(199309)
 */
diff --git a/src/sys/stat/S_TYPEISSHM.c b/src/sys/stat/S_TYPEISSHM.c
index 3e6b1653..34acc7ed 100644
--- a/src/sys/stat/S_TYPEISSHM.c
+++ b/src/sys/stat/S_TYPEISSHM.c
@@ -1,5 +1,5 @@
 #include <sys/stat.h>
-#define S_TYPEISSHM(buf) /* TODO */
+#define S_TYPEISSHM(__buf) /* TODO */
 /*
 POSIX(199309)
 */
diff --git a/src/syslog/LOG_MASK.c b/src/syslog/LOG_MASK.c
index 94ac213d..42eb4a5c 100644
--- a/src/syslog/LOG_MASK.c
+++ b/src/syslog/LOG_MASK.c
@@ -1,5 +1,5 @@
 #include <syslog.h>
-#define LOG_MASK(pri)                                                        pri
+#define LOG_MASK(__pri)                                               (1<<__pri)
 /*
 XOPEN(400)
 */