Author: stsp
Date: Thu Mar 19 10:56:50 2015
New Revision: 1667699
URL: http://svn.apache.org/r1667699
Log:
Follow-up to r1667692:
Blind attempt to fix a build failure with Windows compilers:
conflict-callbacks.c(746): error C2466: cannot allocate an array of
constant size 0
* subversion/svn/conflict-callbacks.c
(handle_text_conflict): Allocate options dynamically.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1667699&r1=1667698&r2=1667699&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Mar 19 10:56:50
2015
@@ -743,12 +743,18 @@ handle_text_conflict(svn_wc_conflict_res
const resolver_option_t *conflict_options = desc->is_binary
? binary_conflict_options
: text_conflict_options;
- const char *options[ARRAY_LEN(conflict_options)];
- const char **next_option = options;
+ const char **options;
+ const char **next_option;
const resolver_option_t *opt;
svn_pool_clear(iterpool);
+ options = apr_palloc(iterpool,
+ desc->is_binary
+ ? ARRAY_LEN(binary_conflict_options)
+ : ARRAY_LEN(text_conflict_options));
+ next_option = options;
+
*next_option++ = "p";
if (diff_allowed)
{
