Skip to content

Follow up: Fix macro in GIDGoogleUser.m #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 29, 2022
Merged

Follow up: Fix macro in GIDGoogleUser.m #263

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20dda82
Fix macro in GIDGoogleUser.m
Alex-4-Git Nov 24, 2022
c80aade
Update macro in GIDGoogleUser
Alex-4-Git Nov 29, 2022
c1e22da
Merge branch 'main' into pin-fixMacro
petea Nov 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions GoogleSignIn/Sources/GIDGoogleUser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,11 @@ - (void)addScopes:(NSArray<NSString *> *)scopes
}

[GIDSignIn.sharedInstance addScopes:scopes
#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
#if TARGET_OS_IOS || TARGET_OS_MACCATALYST
presentingViewController:presentingViewController
#elif TARGET_OS_OSX || TARGET_OS_MACCATALYST
#elif TARGET_OS_OSX
presentingWindow:presentingWindow
#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST
#endif // TARGET_OS_IOS || TARGET_OS_MACCATALYST
completion:completion];
}

Expand Down