summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Jung <rjung@apache.org>2011-07-04 18:37:46 +0200
committerRainer Jung <rjung@apache.org>2011-07-04 18:37:46 +0200
commitd37c52a6e4bbd7d978696dbeeef2d29695e472ae (patch)
tree12af43d94f46d05e90f656a8656bc2b9a7895ceb
parentReset LDFLAGS after zlib testing for mod_deflate. (diff)
downloadapache2-d37c52a6e4bbd7d978696dbeeef2d29695e472ae.tar.xz
apache2-d37c52a6e4bbd7d978696dbeeef2d29695e472ae.zip
Silence compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142733 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--modules/cache/mod_socache_dc.c2
-rw-r--r--modules/ldap/util_ldap.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/cache/mod_socache_dc.c b/modules/cache/mod_socache_dc.c
index 1c11d089fd..7021cbcce8 100644
--- a/modules/cache/mod_socache_dc.c
+++ b/modules/cache/mod_socache_dc.c
@@ -92,7 +92,7 @@ static void socache_dc_destroy(ap_socache_instance_t *ctx, server_rec *s)
static apr_status_t socache_dc_store(ap_socache_instance_t *ctx, server_rec *s,
const unsigned char *id, unsigned int idlen,
- time_t expiry,
+ apr_time_t expiry,
unsigned char *der, unsigned int der_len,
apr_pool_t *p)
{
diff --git a/modules/ldap/util_ldap.c b/modules/ldap/util_ldap.c
index 6b76a64576..9427b69a28 100644
--- a/modules/ldap/util_ldap.c
+++ b/modules/ldap/util_ldap.c
@@ -2444,9 +2444,11 @@ static const char *util_ldap_set_chase_referrals(cmd_parms *cmd,
static const char *util_ldap_set_debug_level(cmd_parms *cmd,
void *config,
const char *arg) {
+#ifdef AP_LDAP_OPT_DEBUG
util_ldap_state_t *st =
(util_ldap_state_t *)ap_get_module_config(cmd->server->module_config,
&ldap_module);
+#endif
const char *err = ap_check_cmd_context(cmd, GLOBAL_ONLY);
if (err != NULL) {