summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2008-07-23 02:58:49 +0000
committerwrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68>2008-07-23 02:58:49 +0000
commiteccc61b6614e149041bc8f3484a5b67ef1da0492 (patch)
tree7b7a86860a6d3a0bfc9c36d36fbca3ec9110c72e
parentbd47603907bf968f78e88bbf6a85b31c2f70b7a0 (diff)
downloadlibapr-util-eccc61b6614e149041bc8f3484a5b67ef1da0492.tar.gz
Round out 675817 by avoiding a skip of a 'special' last element
APU_DSO_LIBDIR where none existed. git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@678982 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--misc/apu_dso.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/misc/apu_dso.c b/misc/apu_dso.c
index 94c229d4..22a9d392 100644
--- a/misc/apu_dso.c
+++ b/misc/apu_dso.c
@@ -162,7 +162,11 @@ apr_status_t apu_dso_load(apr_dso_handle_sym_t *dsoptr, const char *module,
if (rv == APR_SUCCESS) { /* APR_EDSOOPEN */
break;
}
+#if defined(APU_DSO_LIBDIR)
else if (i < paths->nelts - 1) {
+#else
+ else { /* No APU_DSO_LIBDIR to skip */
+#endif
/* try with apr-util-APU_MAJOR_VERSION appended */
eos = apr_cpystrn(eos,
"apr-util-" APU_STRINGIFY(APU_MAJOR_VERSION) "/",