httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/modules/generators mod_status.c mod_status.dsp
Date Sun, 29 Feb 2004 19:05:55 GMT
stoddard    2004/02/29 11:05:55

  Modified:    modules/generators Tag: APACHE_2_0_BRANCH mod_status.c
                        mod_status.dsp
  Log:
  Win32: Fix compile break introduced when this function was backported into 2.0
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.71.2.7  +4 -4      httpd-2.0/modules/generators/mod_status.c
  
  Index: mod_status.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.c,v
  retrieving revision 1.71.2.6
  retrieving revision 1.71.2.7
  diff -u -r1.71.2.6 -r1.71.2.7
  --- mod_status.c	9 Feb 2004 20:53:17 -0000	1.71.2.6
  +++ mod_status.c	29 Feb 2004 19:05:55 -0000	1.71.2.7
  @@ -108,10 +108,10 @@
   #endif
   
   /* Implement 'ap_run_status_hook'. */
  -AP_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(int,status_hook,
  -                                   (request_rec *r, int flags),
  -                                   (r, flags),
  -                                   OK, DECLINED)
  +APR_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(ap, STATUS, int, status_hook,
  +                                    (request_rec *r, int flags),
  +                                    (r, flags),
  +                                    OK, DECLINED)
   
   /*
    * command-related code. This is here to prevent use of ExtendedStatus
  
  
  
  1.21.2.6  +3 -3      httpd-2.0/modules/generators/mod_status.dsp
  
  Index: mod_status.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.dsp,v
  retrieving revision 1.21.2.5
  retrieving revision 1.21.2.6
  diff -u -r1.21.2.5 -r1.21.2.6
  --- mod_status.dsp	11 Mar 2003 01:08:03 -0000	1.21.2.5
  +++ mod_status.dsp	29 Feb 2004 19:05:55 -0000	1.21.2.6
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include"
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_status_src" /FD /c
  +# ADD CPP /nologo /MD /W3 /Zi /O2 /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include"
/D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "STATUS_DECLARE_EXPORT" /Fd"Release\mod_status_src"
/FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_status.so"
/base:@..\..\os\win32\BaseAddr.ref,mod_status.so
  -# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /machine:I386
/out:"Release/mod_status.so" /base:@..\..\os\win32\BaseAddr.ref,mod_status.so /opt:ref
  +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Release/mod_status.so"
/base:@..\..\os\win32\BaseAddr.ref,mod_status.so /opt:ref
   
   !ELSEIF  "$(CFG)" == "mod_status - Win32 Debug"
   
  @@ -69,7 +69,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include"
/I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_status_src"
/FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "../../include" /I "../../srclib/apr/include"
/I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "STATUS_DECLARE_EXPORT"
/Fd"Debug\mod_status_src" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  
  
  

Mime
View raw message