You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2011/07/04 18:37:47 UTC

svn commit: r1142733 - in /httpd/httpd/trunk/modules: cache/mod_socache_dc.c ldap/util_ldap.c

Author: rjung
Date: Mon Jul  4 16:37:46 2011
New Revision: 1142733

URL: http://svn.apache.org/viewvc?rev=1142733&view=rev
Log:
Silence compiler warnings.

Modified:
    httpd/httpd/trunk/modules/cache/mod_socache_dc.c
    httpd/httpd/trunk/modules/ldap/util_ldap.c

Modified: httpd/httpd/trunk/modules/cache/mod_socache_dc.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dc.c?rev=1142733&r1=1142732&r2=1142733&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dc.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dc.c Mon Jul  4 16:37:46 2011
@@ -92,7 +92,7 @@ static void socache_dc_destroy(ap_socach
 
 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)
 {

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=1142733&r1=1142732&r2=1142733&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Mon Jul  4 16:37:46 2011
@@ -2444,9 +2444,11 @@ static const char *util_ldap_set_chase_r
 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) {