svn commit: r1412948 - in /subversion/trunk/subversion: svn/props.c svn_private_config.hw

[br...@apache.org]

Author: brane
Date: Fri Nov 23 16:38:20 2012
New Revision: 1412948

URL: http://svn.apache.org/viewvc?rev=1412948&view=rev
Log:
Issue #4261 (require --force to set unknown svn: prop names)
Fix Windows build warnings and errors.

* subversion/svn_private_config.hw: Define HAVE_QSORT_R
* subversion/svn/props.c (svn_cl__check_svn_prop_name): Cast default score
   to unsigned int on assignment.

Modified:
    subversion/trunk/subversion/svn/props.c
    subversion/trunk/subversion/svn_private_config.hw

Modified: subversion/trunk/subversion/svn/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/props.c?rev=1412948&r1=1412947&r2=1412948&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/props.c (original)
+++ subversion/trunk/subversion/svn/props.c Fri Nov 23 16:38:20 2012
@@ -356,7 +356,7 @@ svn_cl__check_svn_prop_name(const char *
       propkeys[i] = &propbuf[i];
       propbuf[i].name.data = proplist[i];
       propbuf[i].name.len = strlen(proplist[i]);
-      propbuf[i].score = -1;
+      propbuf[i].score = (unsigned int)-1;
 #if !HAVE_QSORT_R
       propbuf[i].context = &context;
 #endif

Modified: subversion/trunk/subversion/svn_private_config.hw
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn_private_config.hw?rev=1412948&r1=1412947&r2=1412948&view=diff
==============================================================================
--- subversion/trunk/subversion/svn_private_config.hw (original)
+++ subversion/trunk/subversion/svn_private_config.hw Fri Nov 23 16:38:20 2012
@@ -82,6 +82,7 @@
 #define SVN_APR_INT64_T_PYCFMT "L"
 #endif
 
+#define HAVE_QSORT_R
 #define SVN_QSORT_R qsort_s
 
 /* Setup gettext macros */