Commit b8939e98 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Remove AP_USE_MMAP_FILES, it doesn't really control anything anymore. Now 

we just use APR_HAS_MMAP directly, just like APR-util does.


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

include/ap_config.h

+0 −6
Original line number Diff line number Diff line
@@ -225,12 +225,6 @@ AP_IMPLEMENT_EXTERNAL_HOOK_RUN_FIRST(AP,ret,name,args_decl,args_use,decline) 
#undef PACKAGE

#undef VERSION



#if APR_HAS_MMAP

#define AP_USE_MMAP_FILES 1

#else

#undef AP_USE_MMAP_FILES

#endif



#if APR_FILE_BASED_SHM

#define AP_USE_FILE_BASED_SCOREBOARD

#else

server/main.c

+4 −7
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static void show_compile_settings(void) 
#ifdef SECURITY_HOLE_PASS_AUTHORIZATION

    printf(" -D SECURITY_HOLE_PASS_AUTHORIZATION\n");

#endif

#ifdef APR_HAS_MMAP

#if APR_HAS_MMAP

    printf(" -D HAVE_MMAP\n");

#endif

#ifdef HAVE_SHMGET
@@ -108,12 +108,9 @@ static void show_compile_settings(void) 
#ifdef AP_USE_MEM_BASED_SCOREBOARD

    printf(" -D AP_USE_MEM_BASED_SCOREBOARD\n");

#endif

#ifdef AP_USE_MMAP_FILES

    printf(" -D AP_USE_MMAP_FILES\n");

#ifdef MMAP_SEGMENT_SIZE

	printf(" -D MMAP_SEGMENT_SIZE=%ld\n",(long)MMAP_SEGMENT_SIZE);

#endif

#endif /*AP_USE_MMAP_FILES*/

#ifdef APR_HAS_MMAP

    printf(" -D APR_HAS_MMAP\n");

#endif /*APR_HAS_MMAP*/

#ifdef NO_WRITEV

    printf(" -D NO_WRITEV\n");

#endif