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

[PATCH] Fix compile when DSOs not available

From: Alex Waugh <alex_at_alexwaugh.com>
Date: 2006-09-07 22:48:00 CEST

Hi

On platforms where APR_HAS_DSO is not defined, Subversion no longer
compiles. This patch fixes it.

Alex

[[[
Fix compile error when APR_HAS_DSO is not defined.

* subversion/include/svn_dso.h,
  subversion/libsvn_subr/dso.c
  (svn_dso_load): Only provide the function when APR_HAS_DSO is defined.
]]]

Index: subversion/include/svn_dso.h
===================================================================
--- subversion/include/svn_dso.h (revision 21377)
+++ subversion/include/svn_dso.h (working copy)
@@ -49,6 +49,7 @@
  */
 void svn_dso_initialize(void);
 
+#if APR_HAS_DSO
 /**
  * Attempt to load @a libname, returning it in @a dso.
  *
@@ -64,6 +65,8 @@
  */
 svn_error_t *svn_dso_load(apr_dso_handle_t **dso, const char *libname);
 
+#endif
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
Index: subversion/libsvn_subr/dso.c
===================================================================
--- subversion/libsvn_subr/dso.c (revision 21377)
+++ subversion/libsvn_subr/dso.c (working copy)
@@ -56,6 +56,8 @@
   dso_cache = apr_hash_make(dso_pool);
 }
 
+#if APR_HAS_DSO
+
 svn_error_t *
 svn_dso_load(apr_dso_handle_t **dso, const char *fname)
 {
@@ -123,3 +125,4 @@
 
   return SVN_NO_ERROR;
 }
+#endif

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Sep 7 22:59:53 2006

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.