subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1798007 - in /subversion/trunk/subversion: include/private/svn_cmdline_private.h libsvn_subr/prompt.c
Date Wed, 07 Jun 2017 23:09:12 GMT
Author: philip
Date: Wed Jun  7 23:09:12 2017
New Revision: 1798007

URL: http://svn.apache.org/viewvc?rev=1798007&view=rev
Log:
Try to fix the Windows build by removing the conditionals around 
an obsolete function.

* subversion/include/private/svn_cmdline_private.h
  (svn_cmdline__auth_gnome_keyring_unlock_prompt): Make unconditional.

* subversion/libsvn_subr/prompt.c
  (svn_cmdline__auth_gnome_keyring_unlock_prompt): Make unconditional.

Modified:
    subversion/trunk/subversion/include/private/svn_cmdline_private.h
    subversion/trunk/subversion/libsvn_subr/prompt.c

Modified: subversion/trunk/subversion/include/private/svn_cmdline_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_cmdline_private.h?rev=1798007&r1=1798006&r2=1798007&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_cmdline_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_cmdline_private.h Wed Jun  7 23:09:12
2017
@@ -34,8 +34,6 @@
 #include "svn_error.h"
 #include "svn_io.h"
 
-#include "svn_private_config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -59,7 +57,6 @@ svn_cmdline__print_xml_prop(svn_stringbu
                             apr_pool_t *pool);
 
 
-#if SVN_HAVE_GNOME_KEYRING
 /** An implementation of @c svn_auth_gnome_keyring_unlock_prompt_func_t that
  * prompts the user for default GNOME Keyring password.
  *
@@ -73,7 +70,6 @@ svn_cmdline__auth_gnome_keyring_unlock_p
                                               const char *keyring_name,
                                               void *baton,
                                               apr_pool_t *pool);
-#endif
 
 /** Container for config options parsed with svn_cmdline__parse_config_option
  *

Modified: subversion/trunk/subversion/libsvn_subr/prompt.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/prompt.c?rev=1798007&r1=1798006&r2=1798007&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/prompt.c (original)
+++ subversion/trunk/subversion/libsvn_subr/prompt.c Wed Jun  7 23:09:12 2017
@@ -922,7 +922,6 @@ svn_cmdline_prompt_user2(const char **re
                 (svn_cmdline_prompt_baton2_t *)baton, pool);
 }
 
-#if SVN_HAVE_GNOME_KEYRING
 /* This implements 'svn_auth_gnome_keyring_unlock_prompt_func_t'. */
 svn_error_t *
 svn_cmdline__auth_gnome_keyring_unlock_prompt(char **keyring_password,
@@ -940,4 +939,3 @@ svn_cmdline__auth_gnome_keyring_unlock_p
   *keyring_password = apr_pstrdup(pool, password);
   return SVN_NO_ERROR;
 }
-#endif



Mime
View raw message