Skip to content

Commit

Permalink
Fix compilation with macOS 10.13 SDK due to assert macros change
Browse files Browse the repository at this point in the history
Predefine __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES to allow
compiling existing code with the newest SDK which doesn't define these
macro versions by default any longer.

Closes #533
  • Loading branch information
fxcoudert authored and vadz committed Aug 9, 2017
1 parent 418d30a commit 9a610ea
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions configure
Expand Up @@ -19770,6 +19770,7 @@ esac

case "${host}" in
*-*-darwin* )
CPPFLAGS="-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1 $CPPFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if CoreFoundation/CFBase.h is usable" >&5
$as_echo_n "checking if CoreFoundation/CFBase.h is usable... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
Expand Down
1 change: 1 addition & 0 deletions configure.in
Expand Up @@ -1361,6 +1361,7 @@ esac
dnl This case is for OS X vs. everything else
case "${host}" in
*-*-darwin* )
CPPFLAGS="-D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1 $CPPFLAGS"
AC_MSG_CHECKING([if CoreFoundation/CFBase.h is usable])
AC_TRY_COMPILE([#include <CoreFoundation/CFBase.h>
],[],
Expand Down
4 changes: 4 additions & 0 deletions docs/changes.txt
Expand Up @@ -595,6 +595,10 @@ wxMSW:

- Fix BSTR memory leaks in wxMediaCtrl and wxWebView (PB).

wxOSX:

- Fix build with 10.13 (High Sierra) SDK (François-Xavier Coudert).


3.0.3: (released 2017-05-02)
----------------------------
Expand Down

1 comment on commit 9a610ea

@zruibin
Copy link

@zruibin zruibin commented on 9a610ea Jan 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also encountered this problem when compiling in macOS 10.13.2
Thank you for your fix.

Please sign in to comment.