summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2019-10-07 14:32:58 +0200
committerPeter Varga <pvarga@inf.u-szeged.hu>2019-10-08 06:27:43 +0000
commitdc5221146d665f5634fab11fb4c9b5515c1ab079 (patch)
treea2fdcd7963e1d91fe3aa1b88c345033184a9e939
parentaf6c0370a4e5d611423ce87418801426f799d6b6 (diff)
FIXUP: Fix building on macOS after 77 mergev5.14.0-beta2
Yet another speculative workaround for MacOSX SDK version check. Change-Id: I4112fd87825d823579ca0041bdb5fc36f0a0b8c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--chromium/base/mac/foundation_util.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/base/mac/foundation_util.h b/chromium/base/mac/foundation_util.h
index 1f68e581ed7..af946ba60a4 100644
--- a/chromium/base/mac/foundation_util.h
+++ b/chromium/base/mac/foundation_util.h
@@ -53,10 +53,10 @@ typedef CR_FORWARD_ENUM(unsigned int, NSSearchPathDirectory);
typedef unsigned int NSSearchPathDomainMask;
#endif
-// The SECTYPE check is a workaround for a presumably wrong macOS SDK detection.
-// This macro was removed from Security.framework of the 10.15 SDK:
+// The CSSM_DEPRECATED check is a workaround for a presumably wrong MacOSX SDK detection.
+// This macro was added to the Security.framework in the 10.15 SDK:
// http://codeworkshop.net/objc-diff/sdkdiffs/macos/10.15/Security.html at SecBase.h
-#if defined(OS_IOS) || (defined(MAC_OS_X_VERSION_10_15) && !defined(SECTYPE))
+#if defined(OS_IOS) || (defined(MAC_OS_X_VERSION_10_15) && defined(CSSM_DEPRECATED))
typedef struct CF_BRIDGED_TYPE(id) __SecCertificate* SecCertificateRef;
typedef struct CF_BRIDGED_TYPE(id) __SecKey* SecKeyRef;
typedef struct CF_BRIDGED_TYPE(id) __SecPolicy* SecPolicyRef;