subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From astie...@apache.org
Subject svn commit: r1829015 - in /subversion/trunk: subversion/svn/help-cmd.c tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
Date Thu, 12 Apr 2018 22:18:29 GMT
Author: astieger
Date: Thu Apr 12 22:18:29 2018
New Revision: 1829015

URL: http://svn.apache.org/viewvc?rev=1829015&view=rev
Log:
Follow-up to r1829012, handle macro correctly

* subversion/svn/help-cmd.c (svn_cl__help): handle macro correctly
* tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
  (svn_min__help): same

Modified:
    subversion/trunk/subversion/svn/help-cmd.c
    subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c

Modified: subversion/trunk/subversion/svn/help-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/help-cmd.c?rev=1829015&r1=1829014&r2=1829015&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/help-cmd.c (original)
+++ subversion/trunk/subversion/svn/help-cmd.c Thu Apr 12 22:18:29 2018
@@ -166,7 +166,7 @@ svn_cl__help(apr_getopt_t *os,
                              pool);
 #endif
     }
-#if (defined(SVN_HAVE_GNOME_KEYRING) || (SVN_HAVE_LIBSECRET))
+#if (defined(SVN_HAVE_GNOME_KEYRING) || defined(SVN_HAVE_LIBSECRET))
   svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
 #endif
 #ifdef SVN_HAVE_GPG_AGENT

Modified: subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c?rev=1829015&r1=1829014&r2=1829015&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c (original)
+++ subversion/trunk/tools/client-side/svn-mergeinfo-normalizer/help-cmd.c Thu Apr 12 22:18:29
2018
@@ -163,7 +163,7 @@ svn_min__help(apr_getopt_t *os,
                                                              pool)),
                          pool);
 #endif
-#if (defined(SVN_HAVE_GNOME_KEYRING) || (SVN_HAVE_LIBSECRET))
+#if (defined(SVN_HAVE_GNOME_KEYRING) || defined(SVN_HAVE_LIBSECRET))
   svn_stringbuf_appendcstr(version_footer, "* Gnome Keyring\n");
 #endif
 #ifdef SVN_HAVE_GPG_AGENT



Mime
View raw message