diff --git a/src/auto/configure b/src/auto/configure index c1d477ca1a..e65884c80a 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -4556,7 +4556,7 @@ if test "`(uname) 2>/dev/null`" = Darwin; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } MACOS_X=yes - CPPFLAGS="$CPPFLAGS -D_DARWIN_C_SOURCE -DMACOS_X" + CPPFLAGS="$CPPFLAGS -DMACOS_X" { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-darwin argument" >&5 $as_echo_n "checking --disable-darwin argument... " >&6; } diff --git a/src/configure.ac b/src/configure.ac index 7f55281839..cfc3b1be1b 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -168,7 +168,7 @@ AC_MSG_CHECKING([for Darwin (Mac OS X)]) if test "`(uname) 2>/dev/null`" = Darwin; then AC_MSG_RESULT(yes) MACOS_X=yes - CPPFLAGS="$CPPFLAGS -D_DARWIN_C_SOURCE -DMACOS_X" + CPPFLAGS="$CPPFLAGS -DMACOS_X" AC_MSG_CHECKING(--disable-darwin argument) AC_ARG_ENABLE(darwin, diff --git a/src/version.c b/src/version.c index 97432839d3..0348dc13e7 100644 --- a/src/version.c +++ b/src/version.c @@ -761,6 +761,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1826, /**/ 1825, /**/