From 0679fa7bf13a23787dca9e8b209211f6fdded5d9 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Thu, 28 Mar 2002 18:58:06 +0000 Subject: [PATCH] moving cfgMerge macros to ssl_engine_config.c, they are not used anywhere else git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94271 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/mod_ssl.h | 6 ------ modules/ssl/ssl_engine_config.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h index 9f35f0eb07..7c8358fb27 100644 --- a/modules/ssl/mod_ssl.h +++ b/modules/ssl/mod_ssl.h @@ -190,12 +190,6 @@ #define strIsEmpty(s) (s == NULL || s[0] == NUL) -#define cfgMerge(el,unset) mrg->el = (add->el == (unset)) ? base->el : add->el -#define cfgMergeArray(el) mrg->el = apr_array_append(p, add->el, base->el) -#define cfgMergeString(el) cfgMerge(el, NULL) -#define cfgMergeBool(el) cfgMerge(el, UNSET) -#define cfgMergeInt(el) cfgMerge(el, UNSET) - #define myConnConfig(c) \ (SSLConnRec *)ap_get_module_config(c->conn_config, &ssl_module) #define myConnConfigSet(c, val) \ diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c index bfb0d9dc02..a717f9671e 100644 --- a/modules/ssl/ssl_engine_config.c +++ b/modules/ssl/ssl_engine_config.c @@ -203,6 +203,12 @@ void *ssl_config_server_create(apr_pool_t *p, server_rec *s) return sc; } +#define cfgMerge(el,unset) mrg->el = (add->el == (unset)) ? base->el : add->el +#define cfgMergeArray(el) mrg->el = apr_array_append(p, add->el, base->el) +#define cfgMergeString(el) cfgMerge(el, NULL) +#define cfgMergeBool(el) cfgMerge(el, UNSET) +#define cfgMergeInt(el) cfgMerge(el, UNSET) + /* * Merge per-server SSL configurations */ -- 2.40.0