On Mon, Jan 21, 2013 at 11:45:10PM +0000, Andreas Stieger wrote:
> Hello,
> 
> [[[
> Make static string literal in svnserve message gettext friendly
> 
> * subversion/svnserve/svnserve.c
>   (svnserve__options): Remove use of nested macro for default port.
>   Breaks scanner and cannot be printf'ed in a static definition of
>   a apr_getopt_option_t[].
> ]]]
> 
> Regards,
> Andreas

+1 from me, please commit. I added this in r1334953/r1335021 and didn't
realise that use of the macro causes problems for translators.

> Index: subversion/svnserve/svnserve.c
> ===================================================================
> --- subversion/svnserve/svnserve.c    (revision 1436546)
> +++ subversion/svnserve/svnserve.c    (working copy)
> @@ -169,11 +169,11 @@ static const apr_getopt_option_t svnserve__options
>       N_("read configuration from file ARG")},
>      {"listen-port",       SVNSERVE_OPT_LISTEN_PORT, 1,
>  #ifdef WIN32
> -     N_("listen port. The default port is " APR_STRINGIFY(SVN_RA_SVN_PORT) 
> ".\n"
> +     N_("listen port. The default port is 3690.\n"
>          "                             "
>          "[mode: daemon, service, listen-once]")},
>  #else
> -     N_("listen port. The default port is " APR_STRINGIFY(SVN_RA_SVN_PORT) 
> ".\n"
> +     N_("listen port. The default port is 3690.\n"
>          "                             "
>          "[mode: daemon, listen-once]")},
>  #endif

Reply via email to