You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <da...@elego.de> on 2013/05/14 05:04:25 UTC

Re: svn commit: r1480406 - in /subversion/trunk: ./ subversion/include/ subversion/include/private/ subversion/libsvn_subr/ subversion/libsvn_subr/utf8proc/ subversion/tests/ subversion/tests/libsvn_subr/

Joe Swatosh wrote on Mon, May 13, 2013 at 18:53:35 -0700:
> Is SIZE_MAX c89? Should it be APR_SIZE_MAX in utf8proc.h (along with
> including svn_dep_compat.h)?

subversion/libsvn_subr/utf8proc/utf8proc.h is a vendor branch.  So
perhaps we should make sure to include a header file that does
#ifndef SIZE_MAX \n #define SIZE_MAX APR_SIZE_MAX \n #endif
before including subversion/libsvn_subr/utf8proc/utf8proc.h ?

Daniel

> --
> Joe
> 
> On Wed, May 8, 2013 at 11:56 AM,  <br...@apache.org> wrote:
> > Author: brane
> > Date: Wed May  8 18:56:18 2013
> > New Revision: 1480406
> >
> > URL: http://svn.apache.org/r1480406
> > Log:
> > Reintegrate wc-collate-path branch to trunk.
> >
> > * subversion/libsvn_subr/sqlite.c: Protect changes related to working copy
> >   database functionality with #ifdef SVN_UNICODE_NORMALIZATION_FIXES.
> >
> > Added:
> >     subversion/trunk/subversion/libsvn_subr/utf8proc/
> >       - copied from r1480384, subversion/branches/wc-collate-path/subversion/libsvn_subr/utf8proc/
> >     subversion/trunk/subversion/libsvn_subr/utf8proc.c
> >       - copied unchanged from r1480384, subversion/branches/wc-collate-path/subversion/libsvn_subr/utf8proc.c
> >     subversion/trunk/subversion/tests/diacritical.txt
> >       - copied unchanged from r1480384, subversion/branches/wc-collate-path/subversion/tests/diacritical.txt
> > Modified:
> >     subversion/trunk/build.conf
> >     subversion/trunk/subversion/include/private/svn_utf_private.h
> >     subversion/trunk/subversion/include/svn_error_codes.h
> >     subversion/trunk/subversion/libsvn_subr/sqlite.c
> >     subversion/trunk/subversion/tests/libsvn_subr/utf-test.c

Re: svn commit: r1480406 - in /subversion/trunk: ./ subversion/include/ subversion/include/private/ subversion/libsvn_subr/ subversion/libsvn_subr/utf8proc/ subversion/tests/ subversion/tests/libsvn_subr/

Posted by Branko Čibej <br...@wandisco.com>.
On 14.05.2013 06:30, Branko Čibej wrote:
> On 14.05.2013 05:04, Daniel Shahaf wrote:
>> Joe Swatosh wrote on Mon, May 13, 2013 at 18:53:35 -0700:
>>> Is SIZE_MAX c89? Should it be APR_SIZE_MAX in utf8proc.h (along with
>>> including svn_dep_compat.h)?
>> subversion/libsvn_subr/utf8proc/utf8proc.h is a vendor branch.  So
>> perhaps we should make sure to include a header file that does
>> #ifndef SIZE_MAX \n #define SIZE_MAX APR_SIZE_MAX \n #endif
>> before including subversion/libsvn_subr/utf8proc/utf8proc.h ?
> It turns out that utf8proc.h includes <stdbool.h> and <stdint.h> on
> platforms other than (predictably) Windows. So if we want to maintain
> C90 compatibility it'll take more than just a hack; we'll have to modify
> the header itself.
>
> Which I don't find to be a particularly big pain since we already
> localize messages in the .c file, for example. It's what vendor branches
> are for after all.

Just to be explicit: Personally, I'm leaning towards leaving well enough
alone, unless we get a report that it doesn't compile on some moderately
important platform. For now, I've seen no such reports.

-- Brane


-- 
Branko Čibej
Director of Subversion | WANdisco | www.wandisco.com


Re: svn commit: r1480406 - in /subversion/trunk: ./ subversion/include/ subversion/include/private/ subversion/libsvn_subr/ subversion/libsvn_subr/utf8proc/ subversion/tests/ subversion/tests/libsvn_subr/

Posted by Branko Čibej <br...@wandisco.com>.
On 14.05.2013 06:30, Branko Čibej wrote:
> On 14.05.2013 05:04, Daniel Shahaf wrote:
>> Joe Swatosh wrote on Mon, May 13, 2013 at 18:53:35 -0700:
>>> Is SIZE_MAX c89? Should it be APR_SIZE_MAX in utf8proc.h (along with
>>> including svn_dep_compat.h)?
>> subversion/libsvn_subr/utf8proc/utf8proc.h is a vendor branch.  So
>> perhaps we should make sure to include a header file that does
>> #ifndef SIZE_MAX \n #define SIZE_MAX APR_SIZE_MAX \n #endif
>> before including subversion/libsvn_subr/utf8proc/utf8proc.h ?
> It turns out that utf8proc.h includes <stdbool.h> and <stdint.h>

Eh, that's <inttypes.h> not <stdint.h>.

>  on
> platforms other than (predictably) Windows. So if we want to maintain
> C90 compatibility it'll take more than just a hack; we'll have to modify
> the header itself.
>
> Which I don't find to be a particularly big pain since we already
> localize messages in the .c file, for example. It's what vendor branches
> are for after all.
>
> -- Brane
>
>


-- 
Branko Čibej
Director of Subversion | WANdisco | www.wandisco.com


Re: svn commit: r1480406 - in /subversion/trunk: ./ subversion/include/ subversion/include/private/ subversion/libsvn_subr/ subversion/libsvn_subr/utf8proc/ subversion/tests/ subversion/tests/libsvn_subr/

Posted by Branko Čibej <br...@wandisco.com>.
On 14.05.2013 05:04, Daniel Shahaf wrote:
> Joe Swatosh wrote on Mon, May 13, 2013 at 18:53:35 -0700:
>> Is SIZE_MAX c89? Should it be APR_SIZE_MAX in utf8proc.h (along with
>> including svn_dep_compat.h)?
> subversion/libsvn_subr/utf8proc/utf8proc.h is a vendor branch.  So
> perhaps we should make sure to include a header file that does
> #ifndef SIZE_MAX \n #define SIZE_MAX APR_SIZE_MAX \n #endif
> before including subversion/libsvn_subr/utf8proc/utf8proc.h ?

It turns out that utf8proc.h includes <stdbool.h> and <stdint.h> on
platforms other than (predictably) Windows. So if we want to maintain
C90 compatibility it'll take more than just a hack; we'll have to modify
the header itself.

Which I don't find to be a particularly big pain since we already
localize messages in the .c file, for example. It's what vendor branches
are for after all.

-- Brane


-- 
Branko Čibej
Director of Subversion | WANdisco | www.wandisco.com