I can't get Subversion to build with neon .24 on Windows without this
patch -- has anyone else tried yet?
Log:
Fix neon-.24 usage on Windows -- neon uses ssize_t which is only
declared in ne_socket.h and neon's config.h (perhaps there's a better
way to get it than including ne_socket.h everywhere?), and in session.c
there's a variable declared and initted using a non-standard style.
Index: subversion/libsvn_ra_dav/merge.c
===================================================================
--- subversion/libsvn_ra_dav/merge.c (revision 6962)
+++ subversion/libsvn_ra_dav/merge.c (working copy)
@@ -23,6 +23,7 @@
#define APR_WANT_STRFUNC
#include <apr_want.h>
+#include <ne_socket.h>
#include <ne_xml.h>
#include <ne_request.h>
Index: subversion/libsvn_ra_dav/log.c
===================================================================
--- subversion/libsvn_ra_dav/log.c (revision 6962)
+++ subversion/libsvn_ra_dav/log.c (working copy)
@@ -27,6 +27,7 @@
#include <apr_portable.h>
#include <apr_xml.h>
+#include <ne_socket.h>
#include <ne_basic.h>
#include <ne_utils.h>
#include <ne_basic.h>
Index: subversion/libsvn_ra_dav/props.c
===================================================================
--- subversion/libsvn_ra_dav/props.c (revision 6962)
+++ subversion/libsvn_ra_dav/props.c (working copy)
@@ -24,6 +24,7 @@
#define APR_WANT_STRFUNC
#include <apr_want.h>
+#include <ne_socket.h>
#include <ne_basic.h>
#include <ne_props.h>
#include <ne_xml.h>
Index: subversion/libsvn_ra_dav/session.c
===================================================================
--- subversion/libsvn_ra_dav/session.c (revision 6962)
+++ subversion/libsvn_ra_dav/session.c (working copy)
@@ -615,6 +615,7 @@
while ((file = apr_strtok(files, ";", &last)) != NULL)
{
+ ne_ssl_certificate *ca_cert;
files = NULL;
#ifndef SVN_RA_DAV__NEED_NEON_SHIM /* Neon 0.23.9 */
@@ -627,7 +628,7 @@
}
#else
- ne_ssl_certificate *ca_cert = ne_ssl_cert_read(file);
+ ca_cert = ne_ssl_cert_read(file);
if (ca_cert == NULL)
{
return svn_error_create(SVN_ERR_RA_DAV_INVALID_CONFIG_VALUE, NULL,
Index: subversion/libsvn_ra_dav/commit.c
===================================================================
--- subversion/libsvn_ra_dav/commit.c (revision 6962)
+++ subversion/libsvn_ra_dav/commit.c (working copy)
@@ -32,6 +32,7 @@
#endif
#include <assert.h>
+#include <ne_socket.h>
#include <ne_request.h>
#include <ne_props.h>
#include <ne_basic.h>
Index: subversion/libsvn_ra_dav/fetch.c
===================================================================
--- subversion/libsvn_ra_dav/fetch.c (revision 6962)
+++ subversion/libsvn_ra_dav/fetch.c (working copy)
@@ -27,6 +27,7 @@
#include <apr_md5.h>
#include <apr_portable.h>
+#include <ne_socket.h>
#include <ne_basic.h>
#include <ne_utils.h>
#include <ne_basic.h>
Index: subversion/libsvn_ra_dav/options.c
===================================================================
--- subversion/libsvn_ra_dav/options.c (revision 6962)
+++ subversion/libsvn_ra_dav/options.c (working copy)
@@ -20,6 +20,7 @@
#include <apr_pools.h>
+#include <ne_socket.h>
#include <ne_request.h>
#include <ne_xml.h>
Index: subversion/libsvn_ra_dav/util.c
===================================================================
--- subversion/libsvn_ra_dav/util.c (revision 6962)
+++ subversion/libsvn_ra_dav/util.c (working copy)
@@ -21,6 +21,7 @@
#define APR_WANT_STRFUNC
#include <apr_want.h>
+#include <ne_socket.h>
#include <ne_uri.h>
#include <ne_compress.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 4 05:37:31 2003