summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/os_mac.h12
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 3 deletions
diff --git a/src/os_mac.h b/src/os_mac.h
index 7a54ee5c5..aadaed776 100644
--- a/src/os_mac.h
+++ b/src/os_mac.h
@@ -268,9 +268,15 @@
*/
#ifdef MACOS_X_UNIX
-# define SIGPROTOARG (int)
-# define SIGDEFARG(s) (s) int s;
-# define SIGDUMMYARG 0
+# ifndef SIGPROTOARG
+# define SIGPROTOARG (int)
+# endif
+# ifndef SIGDEFARG
+# define SIGDEFARG(s) (s) int s UNUSED;
+# endif
+# ifndef SIGDUMMYARG
+# define SIGDUMMYARG 0
+# endif
# undef HAVE_AVAIL_MEM
# ifndef HAVE_CONFIG_H
# define RETSIGTYPE void
diff --git a/src/version.c b/src/version.c
index 6d92a0360..604349469 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 212,
+/**/
211,
/**/
210,