From: Greg Stein Date: Sat, 10 Feb 2001 03:03:18 +0000 (+0000) Subject: *) remove obsolete http_conf_globals.h X-Git-Tag: 2.0.10~37 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23714288fe0e29ec8ce52f4c6ba32a7ca67aebae;p=apache *) remove obsolete http_conf_globals.h *) simplify all this #ifdef'ing: just nuke the unixd.h header. it isn't actually needed. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88045 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/http_conf_globals.h b/include/http_conf_globals.h deleted file mode 100644 index 73fa4d9b65..0000000000 --- a/include/http_conf_globals.h +++ /dev/null @@ -1,75 +0,0 @@ -/* ==================================================================== - * The Apache Software License, Version 1.1 - * - * Copyright (c) 2000 The Apache Software Foundation. All rights - * reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. The end-user documentation included with the redistribution, - * if any, must include the following acknowledgment: - * "This product includes software developed by the - * Apache Software Foundation (http://www.apache.org/)." - * Alternately, this acknowledgment may appear in the software itself, - * if and wherever such third-party acknowledgments normally appear. - * - * 4. The names "Apache" and "Apache Software Foundation" must - * not be used to endorse or promote products derived from this - * software without prior written permission. For written - * permission, please contact apache@apache.org. - * - * 5. Products derived from this software may not be called "Apache", - * nor may "Apache" appear in their name, without prior written - * permission of the Apache Software Foundation. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - * Portions of this software are based upon public domain software - * originally written at the National Center for Supercomputing Applications, - * University of Illinois, Urbana-Champaign. - */ - -#ifndef APACHE_HTTP_CONF_GLOBALS_H -#define APACHE_HTTP_CONF_GLOBALS_H - -#ifdef __cplusplus -extern "C" { -#endif - -/* TODO: this file should be deleted after the other todos are dealt with */ - -/* TODO: extern int ap_configtestonly; ... although it pains me because this breaks an abstraction */ -/* TODO: extern int ap_docrootcheck; */ - -#ifdef __cplusplus -} -#endif - -#endif /* !APACHE_HTTP_CONF_GLOBALS_H */ diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c index f817855f2a..e23c7032ec 100644 --- a/modules/generators/mod_cgi.c +++ b/modules/generators/mod_cgi.c @@ -87,7 +87,6 @@ #include "http_log.h" #include "util_script.h" #include "ap_mpm.h" -#include "http_conf_globals.h" #include "apr_optional.h" #include "../filters/mod_include.h" #ifdef HAVE_STRING_H diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c index 3007323c2b..8ae35df02c 100644 --- a/modules/generators/mod_cgid.c +++ b/modules/generators/mod_cgid.c @@ -88,7 +88,6 @@ #include "http_main.h" #include "http_log.h" #include "util_script.h" -#include "http_conf_globals.h" #include "ap_mpm.h" #include "unixd.h" #include "mod_suexec.h" diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c index df1b485655..a8af1bcbfa 100644 --- a/modules/generators/mod_info.c +++ b/modules/generators/mod_info.c @@ -91,7 +91,7 @@ #include "http_main.h" #include "http_protocol.h" #include "util_script.h" -#include "http_conf_globals.h" + #if APR_HAVE_STRINGS_H #include #endif diff --git a/os/tpf/os.c b/os/tpf/os.c index ae16caf755..ff0121b25d 100644 --- a/os/tpf/os.c +++ b/os/tpf/os.c @@ -66,7 +66,6 @@ #include "os.h" #include "scoreboard.h" #include "http_log.h" -#include "http_conf_globals.h" static FILE *sock_fp; diff --git a/server/mpm/winnt/service.c b/server/mpm/winnt/service.c index 13e73c06ac..1cb2c21288 100644 --- a/server/mpm/winnt/service.c +++ b/server/mpm/winnt/service.c @@ -83,7 +83,6 @@ #define CORE_PRIVATE #include "httpd.h" -#include "http_conf_globals.h" #include "http_log.h" #include "mpm_winnt.h" #include "apr_strings.h" diff --git a/server/scoreboard.c b/server/scoreboard.c index a2385cbe32..009cf28d2c 100644 --- a/server/scoreboard.c +++ b/server/scoreboard.c @@ -64,12 +64,7 @@ #include "http_main.h" #include "http_core.h" #include "http_config.h" -/* ToDo: Fix this right */ -#if !defined(WIN32) && !defined(OS2) && !defined(BEOS) -#include "unixd.h" -#endif -#include "http_conf_globals.h" #include "mpm.h" #include "scoreboard.h" #ifdef HAVE_SYS_TYPES_H