Commit 7cf4f507 authored by Greg Stein's avatar Greg Stein
Browse files

Don't directly include ap_config_auto.h directly. It isn't available on 

Windows platforms. Including ap_config.h will pick it up, or it will grab
the appropriate Windows header/defines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88402 13f79535-47bb-0310-9956-ffa450edef68
parent 7246d9b0

include/mpm_common.h

+1 −3
Original line number Diff line number Diff line
@@ -70,9 +70,7 @@ 
#ifndef APACHE_MPM_COMMON_H

#define APACHE_MPM_COMMON_H



#ifndef WIN32

#include "ap_config_auto.h"

#endif

#include "ap_config.h"



#ifdef HAVE_NETINET_TCP_H

#include <netinet/tcp.h>    /* for TCP_NODELAY */

modules/aaa/mod_auth_digest.c

+12 −12
Original line number Diff line number Diff line
@@ -96,17 +96,6 @@ 
 *   - expired nonces give amaya fits.  

 */



#ifndef WIN32

#include "ap_config_auto.h"

#endif

#include "httpd.h"

#include "http_config.h"

#include "http_core.h"

#include "http_request.h"

#include "http_log.h"

#include "http_protocol.h"

#include "util_uri.h"

#include "util_md5.h"

#include "apr_sha1.h"

#include "apr_base64.h"

#include "apr_lib.h"
@@ -114,9 +103,20 @@ 
#include "apr_errno.h"

#include "apr_lock.h"

#include "apr_strings.h"



#define APR_WANT_STRFUNC

#include "apr_want.h"



#include "ap_config.h"

#include "httpd.h"

#include "http_config.h"

#include "http_core.h"

#include "http_request.h"

#include "http_log.h"

#include "http_protocol.h"

#include "util_uri.h"

#include "util_md5.h"



#if APR_HAS_SHARED_MEMORY

#include "apr_shmem.h"

#else
@@ -151,7 +151,7 @@ apr_status_t apr_shm_open(apr_shmem_t *c) { 
apr_status_t apr_shm_avail(apr_shmem_t *c, apr_size_t *avail) {

    return APR_ENOTIMPL;

}

#endif

#endif /* APR_HAS_SHARED_MEMORY */





/* struct to hold the configuration info */

support/suexec.c

+2 −3
Original line number Diff line number Diff line
@@ -81,13 +81,12 @@ 
#include <stdlib.h>



#include "suexec.h"

#include "ap_config_auto.h"



#if HAVE_PWD_H

#ifdef HAVE_PWD_H

#include <pwd.h>

#endif



#if HAVE_GRP_H

#ifdef HAVE_GRP_H

#include <grp.h>

#endif