You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2017/07/14 12:17:20 UTC
svn commit: r1801946 - in /subversion/trunk/subversion/libsvn_subr/lz4:
LICENSE lz4.c lz4.h
Author: kotkov
Date: Fri Jul 14 12:17:20 2017
New Revision: 1801946
URL: http://svn.apache.org/viewvc?rev=1801946&view=rev
Log:
Following up on r1801938 and r1801939, fix EOL style in the lz4.h
file and set svn:eol-style to native for all added files.
* subversion/libsvn_subr/lz4/LICENSE:
Set svn:eol-style = native.
* subversion/libsvn_subr/lz4/lz4.h:
Set svn:eol-style = native.
* subversion/libsvn_subr/lz4/lz4.c:
Fix inconsistent EOLs, set svn:eol-style = native.
Modified:
subversion/trunk/subversion/libsvn_subr/lz4/LICENSE (props changed)
subversion/trunk/subversion/libsvn_subr/lz4/lz4.c (contents, props changed)
subversion/trunk/subversion/libsvn_subr/lz4/lz4.h (props changed)
Propchange: subversion/trunk/subversion/libsvn_subr/lz4/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Modified: subversion/trunk/subversion/libsvn_subr/lz4/lz4.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/lz4/lz4.c?rev=1801946&r1=1801945&r2=1801946&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/lz4/lz4.c (original)
+++ subversion/trunk/subversion/libsvn_subr/lz4/lz4.c Fri Jul 14 12:17:20 2017
@@ -96,21 +96,21 @@
/*-************************************
* Compiler Options
**************************************/
-#ifdef _MSC_VER /* Visual Studio */
-# define FORCE_INLINE static __forceinline
-# include <intrin.h>
-# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
-# pragma warning(disable : 4293) /* disable: C4293: too large shift (32-bits) */
-#else
-# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */
-# if defined(__GNUC__) || defined(__clang__)
-# define FORCE_INLINE static inline __attribute__((always_inline))
-# else
-# define FORCE_INLINE static inline
-# endif
-# else
-# define FORCE_INLINE static
-# endif /* __STDC_VERSION__ */
+#ifdef _MSC_VER /* Visual Studio */
+# define FORCE_INLINE static __forceinline
+# include <intrin.h>
+# pragma warning(disable : 4127) /* disable: C4127: conditional expression is constant */
+# pragma warning(disable : 4293) /* disable: C4293: too large shift (32-bits) */
+#else
+# if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */
+# if defined(__GNUC__) || defined(__clang__)
+# define FORCE_INLINE static inline __attribute__((always_inline))
+# else
+# define FORCE_INLINE static inline
+# endif
+# else
+# define FORCE_INLINE static
+# endif /* __STDC_VERSION__ */
#endif /* _MSC_VER */
#if (defined(__GNUC__) && (__GNUC__ >= 3)) || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) || defined(__clang__)
Propchange: subversion/trunk/subversion/libsvn_subr/lz4/lz4.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/trunk/subversion/libsvn_subr/lz4/lz4.h
------------------------------------------------------------------------------
svn:eol-style = native
Re: svn commit: r1801946 - in
/subversion/trunk/subversion/libsvn_subr/lz4: LICENSE lz4.c lz4.h
Posted by Branko Čibej <br...@apache.org>.
On 17.07.2017 11:12, Bert Huijben wrote:
>
>> -----Original Message-----
>> From: Evgeny Kotkov [mailto:evgeny.kotkov@visualsvn.com]
>> Sent: vrijdag 14 juli 2017 14:41
>> To: Branko Čibej <br...@apache.org>
>> Cc: commits@subversion.apache.org
>> Subject: Re: svn commit: r1801946 - in
>> /subversion/trunk/subversion/libsvn_subr/lz4: LICENSE lz4.c lz4.h
>>
>> Branko Čibej <br...@apache.org> writes:
>>
>>> Hmmm. Evgeny, don't you use a client that understands the svn:auto-
>> props
>>> inherited property? On trunk:
>>>
>>> $ svn pg svn:auto-props .
>>> *.c = svn:eol-style=native
>>> *.cpp = svn:eol-style=native
>>> *.h = svn:eol-style=native
>>> *.hpp = svn:eol-style=native
>>> *.java = svn:eol-style=native
>>> ...
>>>
>>>
>>> At least your .c and .h files should've been added with correct
>>> eol-style ...
>> Apparently, the /upstream doesn't have svn:auto-props, so the files I
>> have added there don't have svn:eol-style. And so, no properties were
>> set after I copied them.
> The autoprops are on ^/subversion/trunk and are (or should be) *inherited*. Which client did you use for adding?
^/subversion/upstream is not below ^/subversion/trunk.
-- Brane
RE: svn commit: r1801946 - in /subversion/trunk/subversion/libsvn_subr/lz4: LICENSE lz4.c lz4.h
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Evgeny Kotkov [mailto:evgeny.kotkov@visualsvn.com]
> Sent: vrijdag 14 juli 2017 14:41
> To: Branko Čibej <br...@apache.org>
> Cc: commits@subversion.apache.org
> Subject: Re: svn commit: r1801946 - in
> /subversion/trunk/subversion/libsvn_subr/lz4: LICENSE lz4.c lz4.h
>
> Branko Čibej <br...@apache.org> writes:
>
> > Hmmm. Evgeny, don't you use a client that understands the svn:auto-
> props
> > inherited property? On trunk:
> >
> > $ svn pg svn:auto-props .
> > *.c = svn:eol-style=native
> > *.cpp = svn:eol-style=native
> > *.h = svn:eol-style=native
> > *.hpp = svn:eol-style=native
> > *.java = svn:eol-style=native
> > ...
> >
> >
> > At least your .c and .h files should've been added with correct
> > eol-style ...
>
> Apparently, the /upstream doesn't have svn:auto-props, so the files I
> have added there don't have svn:eol-style. And so, no properties were
> set after I copied them.
The autoprops are on ^/subversion/trunk and are (or should be) *inherited*. Which client did you use for adding?
Bert
>
>
> Regards,
> Evgeny Kotkov
RE: svn commit: r1801946 - in /subversion/trunk/subversion/libsvn_subr/lz4: LICENSE lz4.c lz4.h
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: Evgeny Kotkov [mailto:evgeny.kotkov@visualsvn.com]
> Sent: vrijdag 14 juli 2017 14:41
> To: Branko Čibej <br...@apache.org>
> Cc: commits@subversion.apache.org
> Subject: Re: svn commit: r1801946 - in
> /subversion/trunk/subversion/libsvn_subr/lz4: LICENSE lz4.c lz4.h
>
> Branko Čibej <br...@apache.org> writes:
>
> > Hmmm. Evgeny, don't you use a client that understands the svn:auto-
> props
> > inherited property? On trunk:
> >
> > $ svn pg svn:auto-props .
> > *.c = svn:eol-style=native
> > *.cpp = svn:eol-style=native
> > *.h = svn:eol-style=native
> > *.hpp = svn:eol-style=native
> > *.java = svn:eol-style=native
> > ...
> >
> >
> > At least your .c and .h files should've been added with correct
> > eol-style ...
>
> Apparently, the /upstream doesn't have svn:auto-props, so the files I
> have added there don't have svn:eol-style. And so, no properties were
> set after I copied them.
The autoprops are on ^/subversion/trunk and are (or should be) *inherited*. Which client did you use for adding?
Bert
>
>
> Regards,
> Evgeny Kotkov
Re: svn commit: r1801946 - in /subversion/trunk/subversion/libsvn_subr/lz4:
LICENSE lz4.c lz4.h
Posted by Evgeny Kotkov <ev...@visualsvn.com>.
Branko Čibej <br...@apache.org> writes:
> Hmmm. Evgeny, don't you use a client that understands the svn:auto-props
> inherited property? On trunk:
>
> $ svn pg svn:auto-props .
> *.c = svn:eol-style=native
> *.cpp = svn:eol-style=native
> *.h = svn:eol-style=native
> *.hpp = svn:eol-style=native
> *.java = svn:eol-style=native
> ...
>
>
> At least your .c and .h files should've been added with correct
> eol-style ...
Apparently, the /upstream doesn't have svn:auto-props, so the files I
have added there don't have svn:eol-style. And so, no properties were
set after I copied them.
Regards,
Evgeny Kotkov
Re: svn commit: r1801946 - in
/subversion/trunk/subversion/libsvn_subr/lz4: LICENSE lz4.c lz4.h
Posted by Branko Čibej <br...@apache.org>.
On 14.07.2017 14:17, kotkov@apache.org wrote:
> Author: kotkov
> Date: Fri Jul 14 12:17:20 2017
> New Revision: 1801946
>
> * subversion/libsvn_subr/lz4/lz4.h:
> Set svn:eol-style = native.
>
> * subversion/libsvn_subr/lz4/lz4.c:
> Fix inconsistent EOLs, set svn:eol-style = native.
Hmmm. Evgeny, don't you use a client that understands the svn:auto-props
inherited property? On trunk:
$ svn pg svn:auto-props .
*.c = svn:eol-style=native
*.cpp = svn:eol-style=native
*.h = svn:eol-style=native
*.hpp = svn:eol-style=native
*.java = svn:eol-style=native
...
At least your .c and .h files should've been added with correct
eol-style ...
-- Brane