From: Joe Orton Date: Fri, 5 Jul 2019 11:22:46 +0000 (+0000) Subject: Merge r1861690 from trunk: X-Git-Tag: 2.4.40~63 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c37a926b989c8d50c5f6509435f72c3f488b019;p=thirdparty%2Fapache%2Fhttpd.git Merge r1861690 from trunk: * server/util.c: Make "nul" symbol private. Reviewed by: jorton, jfclere, icing git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1862603 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/util.c b/server/util.c index e0c558cee2d..3a0988d5126 100644 --- a/server/util.c +++ b/server/util.c @@ -2828,7 +2828,7 @@ static apr_status_t varbuf_cleanup(void *info_) return APR_SUCCESS; } -const char nul = '\0'; +static const char nul = '\0'; static char * const varbuf_empty = (char *)&nul; AP_DECLARE(void) ap_varbuf_init(apr_pool_t *p, struct ap_varbuf *vb,