On Tue, Feb 07, 2012 at 09:06:03PM +0100, Matthijs Kooijman wrote: > Hey Stefan, > > > FYI, the latter patch fails to compile on Windows. > > See > > http://ci.apache.org/builders/svn-slik-w2k3-x64-local/builds/6580/steps/Build%20Bindings/logs/stdio > Woops, i forgot to #ifdef the declaration like I did with the > implmentation. I reproduced the error here by disabling gnome-keyring > and attached a patch to fix it.
Thanks. I've already committed a similar fix in r1241585. I wasn't quite sure if it was gonna work but glad you had the same idea :) > Add missing ifdefs around declaration of > svn_auth_set_gnome_keyring_unlock_prompt_func (introduced in r1241554). > > There were ifdefs around the implementation already, but not around the > declaration. This caused a compilation failure in the swig bindings on > platforms that did not have gnome-keyring, since a wrapper for a > non-existent function would be generated. > > * core.i > (svn_auth_set_gnome_keyring_unlock_prompt_func): Don not generate > wrapper when gnome-keyring is not available. > > Index: subversion-trunk/subversion/bindings/swig/core.i > =================================================================== > --- subversion-trunk.orig/subversion/bindings/swig/core.i 2012-02-07 > 21:01:37.386228892 +0100 > +++ subversion-trunk/subversion/bindings/swig/core.i 2012-02-07 > 21:01:46.162276754 +0100 > @@ -792,11 +792,12 @@ > %include svn_pools_h.swg > %include svn_version_h.swg > > +#ifdef SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC > /* This is the function defined above */ > void svn_auth_set_gnome_keyring_unlock_prompt_func(svn_auth_baton_t *ab, > > svn_auth_gnome_keyring_unlock_prompt_func_t prompt_func, > void *prompt_baton); > - > +#endif > > /* The constant SVN_PROP_REVISION_ALL_PROPS is a C fragment, not a single > data value, so the SWIG parser will raise a 305 warning if we don't
