Author: stsp
Date: Tue Jun 14 15:49:01 2011
New Revision: 1135655
URL: http://svn.apache.org/viewvc?rev=1135655&view=rev
Log:
* subversion/libsvn_wc/props.c
(prop_conflict_from_skel): Explicitly cast the buffer passed to
svn_io_is_binary_date() to unsigned to avoid a compiler warning.
Found by: philip
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1135655&r1=1135654&r2=1135655&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Tue Jun 14 15:49:01 2011
@@ -607,9 +607,12 @@ prop_conflict_from_skel(const svn_string
/* If any of the property values involved in the diff is binary data,
* do not generate a diff. */
- original_is_binary = svn_io_is_binary_data(original->data, original->len);
- mine_is_binary = svn_io_is_binary_data(mine->data, mine->len);
- incoming_is_binary = svn_io_is_binary_data(incoming->data, incoming->len);
+ original_is_binary = svn_io_is_binary_data((unsigned char *)original->data,
+ original->len);
+ mine_is_binary = svn_io_is_binary_data((unsigned char *)mine->data,
+ mine->len);
+ incoming_is_binary = svn_io_is_binary_data((unsigned char *)incoming->data,
+ incoming->len);
if (!(original_is_binary || mine_is_binary || incoming_is_binary))
{
