]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
This patch corrects the issues from the AP_EXPORT and linkage
authorWilliam A. Rowe Jr <wrowe@apache.org>
Sat, 27 May 2000 05:28:02 +0000 (05:28 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Sat, 27 May 2000 05:28:02 +0000 (05:28 +0000)
commit86e2a18f2a9143d5d1c3de39dc6fd1398057bdde
treebd244d5ab1a211cfb57b07ba0dd323abaf53a3c1
parentc361eb1a65dbdd692b27b45e384c0d32ddfeee2c
  This patch corrects the issues from the AP_EXPORT and linkage
  specification arguments to the ap_hooks.h declarations.  As with
  the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR,
  and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR.

  I will be happy to revert the inclusion of ap_config.h from
  httpd.h if this bothers anyone.  More individual modules need
  to be patched if we do so.

  The API_EXPORTs all moved into central storage in the ap_config.h
  header.  Without WIN32 or API_STATIC compile time declarations,
  these macros remain no-ops.

  This patch also moves the following data from http_main to http_config:

    const char *ap_server_argv0;
    const char *ap_server_root;
    ap_array_header_t *ap_server_pre_read_config;
    ap_array_header_t *ap_server_post_read_config;
    ap_array_header_t *ap_server_config_defines;

  And the following variables had already moved into ap_hooks.c:

    ap_pool_t *g_pHookPool;  (initialized now in http_config)
    int g_bDebugHooks;                   (out of http_config)
    const char *g_szCurrentHookName;     (out of http_config)

  The changes to http_main.c are in preparation for that module to
  move out to a seperate .exe for win32.  Other platforms will be
  unaffected, outside of these changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85309 13f79535-47bb-0310-9956-ffa450edef68
62 files changed:
ApacheCore.dsp
httpd.dsp
include/ap_config.h
include/ap_mpm.h
include/http_config.h
include/http_connection.h
include/http_core.h
include/http_main.h
include/http_protocol.h
include/http_request.h
include/httpd.h
modules/aaa/mod_access.c
modules/aaa/mod_auth.c
modules/aaa/mod_auth_anon.c
modules/aaa/mod_auth_digest.c
modules/cache/mod_file_cache.c
modules/echo/mod_echo.c
modules/filters/mod_include.c
modules/generators/mod_asis.c
modules/generators/mod_autoindex.c
modules/generators/mod_cgi.c
modules/generators/mod_cgid.c
modules/generators/mod_info.c
modules/generators/mod_status.c
modules/http/http_core.c
modules/http/http_protocol.c
modules/http/http_request.c
modules/http/mod_mime.c
modules/loggers/mod_log_config.c
modules/mappers/mod_alias.c
modules/mappers/mod_dir.c
modules/mappers/mod_imap.c
modules/mappers/mod_negotiation.c
modules/mappers/mod_rewrite.c
modules/mappers/mod_so.c
modules/mappers/mod_speling.c
modules/mappers/mod_vhost_alias.c
modules/metadata/mod_cern_meta.c
modules/metadata/mod_env.c
modules/metadata/mod_expires.c
modules/metadata/mod_headers.c
modules/metadata/mod_setenvif.c
modules/metadata/mod_unique_id.c
modules/metadata/mod_usertrack.c
modules/proxy/mod_proxy.c
modules/proxy/mod_proxy.h
os/win32/os.h
server/config.c
server/connection.c
server/mpm/dexter/dexter.c
server/mpm/mpmt_beos/mpmt_beos.c
server/mpm/mpmt_pthread/mpmt_pthread.c
server/mpm/mpmt_pthread/scoreboard.c
server/mpm/mpmt_pthread/scoreboard.h
server/mpm/prefork/prefork.c
server/mpm/prefork/scoreboard.h
server/mpm/spmt_os2/scoreboard.h
server/mpm/spmt_os2/spmt_os2.c
server/mpm/winnt/mpm_winnt.c
server/mpm/winnt/mpm_winnt.h
server/mpm/winnt/registry.c
server/mpm/winnt/service.c