You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Ivan Zhakov <iv...@visualsvn.com> on 2017/10/10 09:04:45 UTC
Re: svn commit: r1810012 - in /httpd/httpd/branches/2.4.x:
libhttpd.dsp libhttpd.mak
On 28 September 2017 at 20:17, <wr...@apache.org> wrote:
>
> Author: wrowe
> Date: Thu Sep 28 17:17:42 2017
> New Revision: 1810012
>
> URL: http://svn.apache.org/viewvc?rev=1810012&view=rev
> Log:
> Duplicate mod_watchdog.h to include/
>
> Modified:
> httpd/httpd/branches/2.4.x/libhttpd.dsp
> httpd/httpd/branches/2.4.x/libhttpd.mak
>
[...]
> Modified: httpd/httpd/branches/2.4.x/libhttpd.mak
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/libhttpd.mak?rev=1810012&r1=1810011&r2=1810012&view=diff
> ==============================================================================
> --- httpd/httpd/branches/2.4.x/libhttpd.mak (original)
> +++ httpd/httpd/branches/2.4.x/libhttpd.mak Thu Sep 28 17:17:42 2017
> @@ -233,11 +233,11 @@ OutDir=.\Debug
>
> !IF "$(RECURSE)" == "0"
>
> -ALL : ".\server\test_char.h" ".\include\mod_so.h" ".\include\mod_proxy.h" ".\include\mod_include.h" ".\include\mod_dav.h" ".\include\mod_cgi.h" ".\include\ap_config_layout.h" "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)"
> +ALL : ".\server\test_char.h" ".\include\mod_watchdog.h" ".\include\mod_so.h" ".\include\mod_proxy.h" ".\include\mod_include.h" ".\include\mod_dav.h" ".\include\mod_cgi.h" ".\include\ap_config_layout.h" "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)"
>
> !ELSE
>
> -ALL : "gen_test_char - Win32 Debug" "libaprutil - Win32 Debug" "libapriconv - Win32 Debug" "libapr - Win32 Debug" ".\server\test_char.h" ".\include\mod_so.h" ".\include\mod_proxy.h" ".\include\mod_include.h" ".\include\mod_dav.h" ".\include\mod_cgi.h" ".\include\ap_config_layout.h" "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)"
> +ALL : "gen_test_char - Win32 Debug" "libaprutil - Win32 Debug" "libapriconv - Win32 Debug" "libapr - Win32 Debug" ".\server\test_char.h" ".\include\mod_watchdog.h" ".\include\mod_so.h" ".\include\mod_proxy.h" ".\include\mod_include.h" ".\include\mod_dav.h" ".\include\mod_cgi.h" ".\include\ap_config_layout.h" "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)"
>
> !ENDIF
That same change should be applied for Release configuration. See
attached patch.
--
Ivan Zhakov
Re: svn commit: r1810012 - in /httpd/httpd/branches/2.4.x:
libhttpd.dsp libhttpd.mak
Posted by William A Rowe Jr <wr...@apache.org>.
On Tue, Oct 10, 2017 at 4:04 AM, Ivan Zhakov <iv...@visualsvn.com> wrote:
> On 28 September 2017 at 20:17, <wr...@apache.org> wrote:
> >
> > Author: wrowe
> > Date: Thu Sep 28 17:17:42 2017
> > New Revision: 1810012
> >
> > URL: http://svn.apache.org/viewvc?rev=1810012&view=rev
> > Log:
> > Duplicate mod_watchdog.h to include/
> >
> > Modified:
> > httpd/httpd/branches/2.4.x/libhttpd.dsp
> > httpd/httpd/branches/2.4.x/libhttpd.mak
> >
>
> [...]
>
> > Modified: httpd/httpd/branches/2.4.x/libhttpd.mak
> > URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/
> libhttpd.mak?rev=1810012&r1=1810011&r2=1810012&view=diff
> > ============================================================
> ==================
> > --- httpd/httpd/branches/2.4.x/libhttpd.mak (original)
> > +++ httpd/httpd/branches/2.4.x/libhttpd.mak Thu Sep 28 17:17:42 2017
> > @@ -233,11 +233,11 @@ OutDir=.\Debug
> >
> > !IF "$(RECURSE)" == "0"
> >
> > -ALL : ".\server\test_char.h" ".\include\mod_so.h"
> ".\include\mod_proxy.h" ".\include\mod_include.h" ".\include\mod_dav.h"
> ".\include\mod_cgi.h" ".\include\ap_config_layout.h"
> "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)"
> > +ALL : ".\server\test_char.h" ".\include\mod_watchdog.h"
> ".\include\mod_so.h" ".\include\mod_proxy.h" ".\include\mod_include.h"
> ".\include\mod_dav.h" ".\include\mod_cgi.h" ".\include\ap_config_layout.h"
> "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)"
> >
> > !ELSE
> >
> > -ALL : "gen_test_char - Win32 Debug" "libaprutil - Win32 Debug"
> "libapriconv - Win32 Debug" "libapr - Win32 Debug" ".\server\test_char.h"
> ".\include\mod_so.h" ".\include\mod_proxy.h" ".\include\mod_include.h"
> ".\include\mod_dav.h" ".\include\mod_cgi.h" ".\include\ap_config_layout.h"
> "$(OUTDIR)\libhttpd.dll" "$(DS_POSTBUILD_DEP)"
> > +ALL : "gen_test_char - Win32 Debug" "libaprutil - Win32 Debug"
> "libapriconv - Win32 Debug" "libapr - Win32 Debug" ".\server\test_char.h"
> ".\include\mod_watchdog.h" ".\include\mod_so.h" ".\include\mod_proxy.h"
> ".\include\mod_include.h" ".\include\mod_dav.h" ".\include\mod_cgi.h"
> ".\include\ap_config_layout.h" "$(OUTDIR)\libhttpd.dll"
> "$(DS_POSTBUILD_DEP)"
> >
> > !ENDIF
>
> That same change should be applied for Release configuration. See
> attached patch.
Committed, thanks!