diff options
| author | Jack Lloyd <[email protected]> | 2019-04-08 10:34:48 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-04-08 10:34:48 -0400 |
| commit | a6ec30798ddcc69b49c2900cc4923fff67d6b5a4 (patch) | |
| tree | 61042a18219f4fc238b840b5d003e34ea273d10d | |
| parent | 71944443d8f06a13673c0ab1fc66170c4e5732bb (diff) | |
| parent | 2006b469c1d1038737c1afe908300fab87d50062 (diff) | |
Merge GH #1884 Avoid macro conflicts from Apple headers
| -rw-r--r-- | src/lib/x509/certstor_system_macos/certstor_macos.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/x509/certstor_system_macos/certstor_macos.cpp b/src/lib/x509/certstor_system_macos/certstor_macos.cpp index 3a3652ae1..5672385ae 100644 --- a/src/lib/x509/certstor_system_macos/certstor_macos.cpp +++ b/src/lib/x509/certstor_system_macos/certstor_macos.cpp @@ -11,6 +11,7 @@ #include <algorithm> #include <array> +#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 #include <CoreFoundation/CoreFoundation.h> #include <CoreServices/CoreServices.h> |