Index: subversion/include/svn_auth.h
===================================================================
--- subversion/include/svn_auth.h	(revision 1761722)
+++ subversion/include/svn_auth.h	(working copy)
@@ -943,7 +943,7 @@ svn_auth_get_windows_ssl_server_trust_provider(
 
 #endif /* WIN32 && !__MINGW32__ || DOXYGEN */
 
-#if defined(DARWIN) || defined(DOXYGEN)
+#if defined(SVN_HAVE_KEYCHAIN_SERVICES) || defined(DOXYGEN)
 /**
  * Set @a *provider to an authentication provider of type @c
  * svn_auth_cred_simple_t that gets/sets information from the user's
@@ -984,7 +984,7 @@ void
 svn_auth_get_keychain_ssl_client_cert_pw_provider(
   svn_auth_provider_object_t **provider,
   apr_pool_t *pool);
-#endif /* DARWIN || DOXYGEN */
+#endif /* SVN_HAVE_KEYCHAIN_SERVICES || DOXYGEN */
 
 /* Note that the gnome keyring unlock prompt related items below must be
  * declared for all platforms in order to allow SWIG interfaces to be
Index: subversion/libsvn_subr/auth.h
===================================================================
--- subversion/libsvn_subr/auth.h	(revision 1761722)
+++ subversion/libsvn_subr/auth.h	(working copy)
@@ -103,7 +103,7 @@ svn_auth__get_windows_ssl_server_trust_provider(
   apr_pool_t *pool);
 #endif /* WIN32 && !__MINGW32__ || DOXYGEN */
 
-#if defined(DARWIN) || defined(DOXYGEN)
+#if defined(SVN_HAVE_KEYCHAIN_SERVICES) || defined(DOXYGEN)
 /**
  * Set @a *provider to an authentication provider of type @c
  * svn_auth_cred_simple_t that gets/sets information from the user's
@@ -134,7 +134,7 @@ void
 svn_auth__get_keychain_ssl_client_cert_pw_provider(
   svn_auth_provider_object_t **provider,
   apr_pool_t *pool);
-#endif /* DARWIN || DOXYGEN */
+#endif /* SVN_HAVE_KEYCHAIN_SERVICES || DOXYGEN */
 
 #if !defined(WIN32) || defined(DOXYGEN)
 /**
Index: subversion/libsvn_subr/deprecated.c
===================================================================
--- subversion/libsvn_subr/deprecated.c	(revision 1761722)
+++ subversion/libsvn_subr/deprecated.c	(working copy)
@@ -1516,7 +1516,7 @@ svn_auth_get_windows_ssl_server_trust_provider
 #endif /* WIN32 && !__MINGW32__ */
 
 /*** From macos_keychain.c ***/
-#if defined(DARWIN)
+#if defined(SVN_HAVE_KEYCHAIN_SERVICES)
 void
 svn_auth_get_keychain_simple_provider(svn_auth_provider_object_t **provider,
                                       apr_pool_t *pool)
@@ -1531,7 +1531,7 @@ svn_auth_get_keychain_ssl_client_cert_pw_provider
 {
   svn_auth__get_keychain_ssl_client_cert_pw_provider(provider, pool);
 }
-#endif /* DARWIN */
+#endif /* SVN_HAVE_KEYCHAIN_SERVICES */
 
 #if !defined(WIN32)
 void