Philip Martin <philip@codematters.co.uk> wrote on 02/14/2006 12:24:08 PM:
> Paul Burba <paulb@softlanding.com> writes:
>
> > Index: subversion/libsvn_client/diff.c
> > ===================================================================
> > --- subversion/libsvn_client/diff.c (revision 18448)
> > +++ subversion/libsvn_client/diff.c (working copy)
> > @@ -2546,7 +2546,12 @@
> > {
> > return svn_client_diff3 (options, path1, revision1, path2,
revision2,
> > recurse, ignore_ancestry, no_diff_deleted,
> > - ignore_content_type, APR_LOCALE_CHARSET,
> > + ignore_content_type,
> > +#ifndef AS400
> > + APR_LOCALE_CHARSET,
> > +#else
> > + apr_psprintf (pool, "%i",
APR_LOCALE_CHARSET),
> > +#endif
> > outfile, errfile, ctx, pool);
> > }
>
> I'd much rather see the conditional stuff hidden behind some sort of
> macro. Perhaps something like:
>
> #ifndef AS400
> #define SVN_APR_LOCALE_CHARSET APR_LOCALE_CHARSET
> #else
> #define SVN_APR_LOCALE_CHARSET APR_STRINGIFY(APR_LOCALE_CHARSET)
> #endif
>
> or (following apr)
>
> #ifndef AS400
> #define SVN_APR_LOCALE_CHARSET APR_LOCALE_CHARSET
> #else
> #define SVN_APR_LOCALE_CHARSET ((const char*)APR_LOCALE_CHARSET)
> #endif
Philip,
I have most of this patch working with your suggestions. Before posting a
more lengthy response, I wanted to know where the most appropriate place
to put these #defines is? Any thoughts?
Thanks,
Paul B.
_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. and SoftLanding Europe Plc by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Feb 15 14:26:10 2006