Author: rjung
Date: Tue Jan 6 16:16:48 2015
New Revision: 1649859
URL: http://svn.apache.org/r1649859
Log:
Fix compiler error (declare at start of block).
Modified:
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1649859&r1=1649858&r2=1649859&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Tue Jan 6 16:16:48 2015
@@ -3853,6 +3853,7 @@ static char *path_merge(const char *root
rsz = strlen(root);
/* Normalize path */
if ((rel = relative_path(merge, &remain))) {
+ size_t bl;
if (remain > 0) {
char *skip = root + rsz - 1;
char *spr;
@@ -3877,7 +3878,7 @@ static char *path_merge(const char *root
/* one additional byte for trailing '\0',
* one additional byte for eventual path
* separator between root and merge */
- size_t bl = strlen(root) + sz + 2;
+ bl = strlen(root) + sz + 2;
out = malloc(bl);
if (out == 0)
return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
