diff options
| author | Keith Randall <khr@google.com> | 2018-07-16 10:45:25 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2018-08-08 00:27:12 +0000 |
| commit | 2b07564d191f8604c847859b536390bef5954f88 (patch) | |
| tree | 1b8717bf8d592e8018fd92b98270cc8598dc5d06 | |
| parent | 1dea6c5269e67ab7c8201988cf6e15f914f1a8f7 (diff) | |
| download | go-2b07564d191f8604c847859b536390bef5954f88.tar.gz go-2b07564d191f8604c847859b536390bef5954f88.zip | |
[release-branch.go1.10] misc/cgo: fix darwin test, again
TARGET_OS_OSX is the right macro, but it also was only introduced
in 1.12. For 1.11 and earlier a reasonable substitution is
TARGET_OS_IPHONE == 0.
Update #25036
Change-Id: I5f43c463d14fada9ed1d83cc684c7ea05d94c5f3
Reviewed-on: https://go-review.googlesource.com/124075
Run-TryBot: Keith Randall <khr@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-on: https://go-review.googlesource.com/124218
| -rw-r--r-- | misc/cgo/test/issue24161e0/main.go | 2 | ||||
| -rw-r--r-- | misc/cgo/test/issue24161e1/main.go | 2 | ||||
| -rw-r--r-- | misc/cgo/test/issue24161e2/main.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/misc/cgo/test/issue24161e0/main.go b/misc/cgo/test/issue24161e0/main.go index 72985b6c77..cbc1deea78 100644 --- a/misc/cgo/test/issue24161e0/main.go +++ b/misc/cgo/test/issue24161e0/main.go @@ -12,7 +12,7 @@ package issue24161e0 #include <TargetConditionals.h> #include <CoreFoundation/CoreFoundation.h> #include <Security/Security.h> -#if TARGET_OS_OSX && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200 +#if TARGET_OS_IPHONE == 0 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200 typedef CFStringRef SecKeyAlgorithm; static CFDataRef SecKeyCreateSignature(SecKeyRef key, SecKeyAlgorithm algorithm, CFDataRef dataToSign, CFErrorRef *error){return NULL;} #define kSecKeyAlgorithmECDSASignatureDigestX962SHA1 foo() diff --git a/misc/cgo/test/issue24161e1/main.go b/misc/cgo/test/issue24161e1/main.go index 8a31e22397..eb48fc0059 100644 --- a/misc/cgo/test/issue24161e1/main.go +++ b/misc/cgo/test/issue24161e1/main.go @@ -12,7 +12,7 @@ package issue24161e1 #include <TargetConditionals.h> #include <CoreFoundation/CoreFoundation.h> #include <Security/Security.h> -#if TARGET_OS_OSX && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200 +#if TARGET_OS_IPHONE == 0 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200 typedef CFStringRef SecKeyAlgorithm; static CFDataRef SecKeyCreateSignature(SecKeyRef key, SecKeyAlgorithm algorithm, CFDataRef dataToSign, CFErrorRef *error){return NULL;} #define kSecKeyAlgorithmECDSASignatureDigestX962SHA1 foo() diff --git a/misc/cgo/test/issue24161e2/main.go b/misc/cgo/test/issue24161e2/main.go index f4e0def8c0..1951c86317 100644 --- a/misc/cgo/test/issue24161e2/main.go +++ b/misc/cgo/test/issue24161e2/main.go @@ -12,7 +12,7 @@ package issue24161e2 #include <TargetConditionals.h> #include <CoreFoundation/CoreFoundation.h> #include <Security/Security.h> -#if TARGET_OS_OSX && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200 +#if TARGET_OS_IPHONE == 0 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200 typedef CFStringRef SecKeyAlgorithm; static CFDataRef SecKeyCreateSignature(SecKeyRef key, SecKeyAlgorithm algorithm, CFDataRef dataToSign, CFErrorRef *error){return NULL;} #define kSecKeyAlgorithmECDSASignatureDigestX962SHA1 foo() |