[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Prevent javahl compile error on Windows x64

From: Jens Peters <jpeters7677_at_gmx.de>
Date: Sun, 08 Jun 2008 14:31:17 +0200


When you try to compile javahl on Windows with x64 (VS 2008 with Windows
SDK 6.1) as target platform you will get the following compiler error:

'apr_conv_ucs2_to_utf8' : cannot convert parameter 2 from 'unsigned int
*' to 'apr_size_t *'

the attached patch fixes that.

* subversion/bindings/javahl/native/JNIUtil.cpp
   Change the type of 'inwords' and 'outbytes' to apr_size_t to prevent a
   compile error when compiling for Windows x64.

Patch by: jpeters7677_at_gmx.de

Index: subversion/bindings/javahl/native/JNIUtil.cpp
--- subversion/bindings/javahl/native/JNIUtil.cpp (revision 31618)
+++ subversion/bindings/javahl/native/JNIUtil.cpp (working copy)
@@ -183,7 +183,8 @@
     const char *internal_path;
     apr_pool_t *pool;
     apr_status_t apr_err;
- unsigned int inwords, outbytes, outlength;
+ apr_size_t inwords, outbytes;
+ unsigned int outlength;
     apr_pool_create(&pool, 0);
     /* get dll name - our locale info will be in '../share/locale' */

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-08 14:31:40 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.