diff options
| author |  Mark Mentovai <mark@chromium.org> | 2017-07-10 17:24:25 -0400 |
|---|---|---|
| committer |  Thomas Van Lenten <thomasvl@google.com> | 2017-07-10 17:41:00 -0400 |
| commit | ec72a2bc500a716369c383837bffdc7d2a22855b (patch) | |
| tree | 51caaa4dff0df947186a969f697acd3d53f55a41 /Foundation/GTMServiceManagement.c | |
| parent | c867eb4055d715b8aa56e1ce630e739df3abdc0a (diff) | |
10.13 SDK (and iOS 11 equivalent) compatibility for GTM
Starting in the 10.6 SDK, the non-underscored and all-lowercase macro
names in <AssertMacros.h> were deprecated. In the 10.13 SDK shipping in
Xcode 9 beta 3 (but not previous betas of Xcode 9), Apple has made good
on its promise to eventually disable these names. Update GTM to use the
new underscored mixed-case names.
Provided that nobody needs to target anything older than the 10.5 SDK
anymore, this should be a safe change.
Aside from GTMCarbonEvent.m, which is used by Chrome, this change is
untested, and was made by mechanically replacing uses of the various
check, require, and verify macros found in GTM.
Diffstat (limited to 'Foundation/GTMServiceManagement.c')
| -rw-r--r-- | Foundation/GTMServiceManagement.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Foundation/GTMServiceManagement.c b/Foundation/GTMServiceManagement.c index dfd0dc6..a57bc2a 100644 --- a/Foundation/GTMServiceManagement.c +++ b/Foundation/GTMServiceManagement.c @@ -88,9 +88,9 @@ static bool IsOsYosemiteOrGreater() { #else SInt32 version_major; SInt32 version_minor; - require_noerr(Gestalt(gestaltSystemVersionMajor, &version_major), + __Require_noErr(Gestalt(gestaltSystemVersionMajor, &version_major), failedGestalt); - require_noerr(Gestalt(gestaltSystemVersionMinor, &version_minor), + __Require_noErr(Gestalt(gestaltSystemVersionMinor, &version_minor), failedGestalt); return version_major > 10 || (version_major == 10 && version_minor >= 10); failedGestalt: |