Follow up: Fix macro in GIDGoogleUser.m (#263)

Alex-4-Git · petea · web-flow · commit e587132bbca5 · 2022-11-29T12:21:43.000-08:00
Co-authored-by: Peter Andrews &lt;petea@google.com&gt;
diff --git a/GoogleSignIn/Sources/GIDGoogleUser.m b/GoogleSignIn/Sources/GIDGoogleUser.m
@@ -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];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -204,11 +204,11 @@ - (void)addScopes:(NSArray<NSString > )scopes`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`[GIDSignIn.sharedInstance addScopes:scopes`
`207`		`-#if TARGET_OS_IOS && !TARGET_OS_MACCATALYST`
	`207`	`+#if TARGET_OS_IOS \|\| TARGET_OS_MACCATALYST`
`208`	`208`	`presentingViewController:presentingViewController`
`209`		`-#elif TARGET_OS_OSX \|\| TARGET_OS_MACCATALYST`
	`209`	`+#elif TARGET_OS_OSX`
`210`	`210`	`presentingWindow:presentingWindow`
`211`		`-#endif // TARGET_OS_IOS && !TARGET_OS_MACCATALYST`
	`211`	`+#endif // TARGET_OS_IOS \|\| TARGET_OS_MACCATALYST`
`212`	`212`	`completion:completion];`
`213`	`213`	`}`
`214`	`214`