Rev 1701: Fix compatibility with svn 1.4 on Windows. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

Jelmer Vernooij jelmer at samba.org
Thu Sep 4 18:02:38 BST 2008


At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1701
revision-id: jelmer at samba.org-20080904170226-c6ygcz8mbk2rqpnw
parent: jelmer at samba.org-20080902195347-vk4v1f05ktfc9spt
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-09-04 19:02:26 +0200
message:
  Fix compatibility with svn 1.4 on Windows.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
=== modified file 'NEWS'
--- a/NEWS	2008-09-01 14:58:24 +0000
+++ b/NEWS	2008-09-04 17:02:26 +0000
@@ -1,5 +1,9 @@
 bzr-svn 0.4.13	UNRELEASED
 
+  BUG FIXES
+
+   * Fix compatibility with Subversion 1.4 on Windows.
+
 bzr-svn 0.4.12	2008-09-01
 
   BUG FIXES

=== modified file 'ra.c'
--- a/ra.c	2008-08-31 13:39:14 +0000
+++ b/ra.c	2008-09-04 17:02:26 +0000
@@ -2729,7 +2729,7 @@
 	return (PyObject *)auth;
 }
 
-#if defined(WIN32)
+#if defined(WIN32) 
 static PyObject *get_windows_simple_provider(PyObject* self)
 {
 	AuthProviderObject *auth = PyObject_New(AuthProviderObject, &AuthProvider_Type);
@@ -2740,6 +2740,7 @@
 	return (PyObject *)auth;
 }
 
+#if SVN_VER_MAJOR >= 1 && SVN_VER_MINOR >= 5
 static PyObject *get_windows_ssl_server_trust_provider(PyObject *self)
 {
 	AuthProviderObject *auth = PyObject_New(AuthProviderObject, &AuthProvider_Type);
@@ -2750,6 +2751,7 @@
 	return (PyObject *)auth;
 }
 #endif
+#endif
 
 static PyMethodDef ra_module_methods[] = {
 	{ "version", (PyCFunction)version, METH_NOARGS, NULL },
@@ -2759,8 +2761,10 @@
 	{ "get_simple_provider", (PyCFunction)get_simple_provider, METH_NOARGS, NULL },
 #if defined(WIN32)
 	{ "get_windows_simple_provider", (PyCFunction)get_windows_simple_provider, METH_NOARGS, NULL },
+#if SVN_VER_MAJOR >= 1 && SVN_VER_MINOR >= 5
 	{ "get_windows_ssl_server_trust_provider", (PyCFunction)get_windows_ssl_server_trust_provider, METH_NOARGS, NULL },
 #endif
+#endif
 	{ "get_username_prompt_provider", (PyCFunction)get_username_prompt_provider, METH_VARARGS, NULL },
 	{ "get_simple_prompt_provider", (PyCFunction)get_simple_prompt_provider, METH_VARARGS, NULL },
 	{ "get_ssl_server_trust_prompt_provider", (PyCFunction)get_ssl_server_trust_prompt_provider, METH_VARARGS, NULL },




More information about the bazaar-commits mailing list