From 1fc15c1a656b75d733dee6e4b6c9ca08a41fce8f Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 16 Dec 2016 18:21:24 +0000 Subject: [PATCH] Merge r1774609 from trunk: Add ../generators to include path for Windows build of mod_socache_memcache. It now needs mod_status.h. Untested but exactly analogous to what works for mod_socache_shmcb and others. Submitted by: rjung Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1774643 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 8 -------- modules/cache/mod_socache_memcache.dsp | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/STATUS b/STATUS index b9be65830a..30ba79c687 100644 --- a/STATUS +++ b/STATUS @@ -141,14 +141,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk works +1: ylavic, jim - *) mod_socache_memcache: Add ../generators to include path for Windows - build. It now needs mod_status.h. - Untested but exactly analogous to what works for - mod_socache_shmcb and others. - trunk patch: http://svn.apache.org/r1774609 - 2.4.x patch: trunk works - +1: rjung, jim - PATCHES/ISSUES THAT ARE BEING WORKED [ New entried should be added at the START of the list ] diff --git a/modules/cache/mod_socache_memcache.dsp b/modules/cache/mod_socache_memcache.dsp index e4f81a3c2a..d530826961 100644 --- a/modules/cache/mod_socache_memcache.dsp +++ b/modules/cache/mod_socache_memcache.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "mod_socache_memcache_EXPORTS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_socache_memcache_src" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /I "../generators" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_socache_memcache_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -75,7 +75,7 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_socache_memcache_src" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../srclib/apr-util/include" /I "../../srclib/apr/include" /I "../../include" /I "../generators" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_socache_memcache_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" -- 2.49.0