Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r724745 - in /httpd/httpd/trunk: include/ap_socache.h
 modules/ssl/ssl_scache.c
Date: Tue, 09 Dec 2008 15:19:08 -0000
To: cvs@httpd.apache.org
From: jorton@apache.org
Message-Id: <20081209151908.BDA102388879@eris.apache.org>

Author: jorton
Date: Tue Dec  9 07:19:08 2008
New Revision: 724745

URL: http://svn.apache.org/viewvc?rev=724745&view=rev
Log:
* include/ap_socache.h: Use C++ safety wrappers, and rename ->delete
  to ->remove since the former is a C++ reserved word.

* modules/ssl/ssl_scache.c (ssl_scache_remove): Update accordingly.

Modified:
    httpd/httpd/trunk/include/ap_socache.h
    httpd/httpd/trunk/modules/ssl/ssl_scache.c

Modified: httpd/httpd/trunk/include/ap_socache.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_socache.h?rev=724745&r1=724744&r2=724745&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_socache.h (original)
+++ httpd/httpd/trunk/include/ap_socache.h Tue Dec  9 07:19:08 2008
@@ -30,7 +30,11 @@
 #include "ap_provider.h"
 #include "apr_pools.h"
 
-/** If this flag is set, the store/retrieve/delete/status interfaces
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** If this flag is set, the store/retrieve/remove/status interfaces
  * of the provider are NOT safe to be called concurrently from
  * multiple processes or threads, and an external global mutex must be
  * used to serialize access to the provider. */
@@ -141,7 +145,7 @@
      * @param idlen Length of id blob
      * @param pool Pool for temporary allocations.
      */
-    void (*delete)(ap_socache_instance_t *instance, server_rec *s,
+    void (*remove)(ap_socache_instance_t *instance, server_rec *s,
                    const unsigned char *id, unsigned int idlen,
                    apr_pool_t *pool);
 
@@ -163,5 +167,9 @@
 /** Default provider name. */
 #define AP_SOCACHE_DEFAULT_PROVIDER "default"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* AP_SOCACHE_H */
 /** @} */

Modified: httpd/httpd/trunk/modules/ssl/ssl_scache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_scache.c?rev=724745&r1=724744&r2=724745&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_scache.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_scache.c Tue Dec  9 07:19:08 2008
@@ -161,7 +161,7 @@
         ssl_mutex_on(s);
     }
 
-    mc->sesscache->delete(mc->sesscache_context, s, id, idlen, p);
+    mc->sesscache->remove(mc->sesscache_context, s, id, idlen, p);
 
     if (mc->sesscache->flags & AP_SOCACHE_FLAG_NOTMPSAFE) {
         ssl_mutex_off(s);