You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2008/10/13 09:29:04 UTC
Re: svn commit: r33610 - trunk/subversion/bindings/swig
Euh... can't you just use #ifndef rather than the bulky #if !defined(...) ??
On Mon, Oct 13, 2008 at 12:28 AM, <jw...@tigris.org> wrote:
> Author: jwhitlock
> Date: Mon Oct 13 00:28:20 2008
> New Revision: 33610
>
> Log:
> * subversion/bindings/swig/core.i,
> subversion/bindings/swig/svn_client.i: Conditionally include platform-specific
> auth providers.
>
> Modified:
> trunk/subversion/bindings/swig/core.i
> trunk/subversion/bindings/swig/svn_client.i
>
> Modified: trunk/subversion/bindings/swig/core.i
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/bindings/swig/core.i?pathrev=33610&r1=33609&r2=33610
> ==============================================================================
> --- trunk/subversion/bindings/swig/core.i Sun Oct 12 15:04:20 2008 (r33609)
> +++ trunk/subversion/bindings/swig/core.i Mon Oct 13 00:28:20 2008 (r33610)
> @@ -217,6 +217,34 @@
> %ignore svn_path_cstring_from_utf8;
> %ignore svn_path_cstring_to_utf8;
>
> +%import "../../../svn_private_config.h"
> +
> +/* svn_auth.h: Conditionally include OS X auth providers. */
> +#if !defined(SVN_HAVE_KEYCHAIN_SERVICES)
> +%ignore svn_auth_get_keychain_simple_provider;
> +%ignore svn_auth_get_keychain_ssl_client_cert_pw_provider;
> +#endif
> +
> +/* svn_auth.h: Conditionally include Gnome Keyring auth providers. */
> +#if !defined(SVN_HAVE_GNOME_KEYRING)
> +%ignore svn_auth_gnome_keyring_version;
> +%ignore svn_auth_get_gnome_keyring_simple_provider;
> +%ignore svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider;
> +#endif
> +
> +/* svn_auth.h: Conditionally include Kwallet auth providers. */
> +#if !defined(SVN_HAVE_KWALLET)
> +%ignore svn_auth_kwallet_version;
> +%ignore svn_auth_get_kwallet_simple_provider;
> +%ignore svn_auth_get_kwallet_ssl_client_cert_pw_provider;
> +#endif
> +
> +/* svn_auth.h: Conditionally include Windows auth providers. */
> +#if !defined(SWIGWIN)
> +%ignore svn_auth_get_windows_simple_provider;
> +%ignore svn_auth_get_windows_ssl_server_trust_provider;
> +#endif
> +
> /* Other files */
> /* bad pool convention */
> %ignore svn_opt_print_generic_help;
>
> Modified: trunk/subversion/bindings/swig/svn_client.i
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/bindings/swig/svn_client.i?pathrev=33610&r1=33609&r2=33610
> ==============================================================================
> --- trunk/subversion/bindings/swig/svn_client.i Sun Oct 12 15:04:20 2008 (r33609)
> +++ trunk/subversion/bindings/swig/svn_client.i Mon Oct 13 00:28:20 2008 (r33610)
> @@ -29,6 +29,11 @@
> %import svn_delta.i
> %import svn_wc.i
>
> +/* svn_client.h: Conditionally include Windows auth provider. */
> +#if !defined(SWIGWIN)
> +%ignore svn_client_get_windows_simple_provider;
> +#endif
> +
> /* -----------------------------------------------------------------------
> %apply-ing of typemaps defined elsewhere
> */
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r33610 - trunk/subversion/bindings/swig
Posted by Jeremy Whitlock <jc...@gmail.com>.
> Euh... can't you just use #ifndef rather than the bulky #if !defined(...) ??
Yeah, that should work. We have a mixture of both syntaxes and I was
working with svn_auth.h which has the syntax I use. I can commit a
follow-up to change syntax if necessary.
--
Take care,
Jeremy Whitlock
http://www.thoughtspark.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org