httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bill Stoddard" <b...@wstoddard.com>
Subject FW: cvs commit: httpd-2.0/os/win32 ap_regkey.c util_win32.c
Date Wed, 08 Jan 2003 19:33:26 GMT
Sander,
This patch is needed in 2.0.44 to fix a compile break. I have already committed
it to 2.0 and 2.1

Bill

stoddard    2003/01/08 11:22:29

  Modified:    os/win32 Tag: APACHE_2_0_BRANCH ap_regkey.c util_win32.c
  Log:
  Fix compile break on Windows due to apr/include/arch/win32/* filename renames.

  Revision  Changes    Path
  No                   revision


  No                   revision


  1.6.2.1   +3 -3      httpd-2.0/os/win32/ap_regkey.c

  Index: ap_regkey.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/win32/ap_regkey.c,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- ap_regkey.c	29 Jul 2002 05:06:20 -0000	1.6
  +++ ap_regkey.c	8 Jan 2003 19:22:28 -0000	1.6.2.1
  @@ -59,8 +59,8 @@
   #ifdef WIN32

   #include "apr.h"
  -#include "arch/win32/fileio.h"
  -#include "arch/win32/misc.h"
  +#include "arch/win32/apr_arch_file_io.h"
  +#include "arch/win32/apr_arch_misc.h"
   #include "ap_regkey.h"

   struct ap_regkey_t {
  @@ -683,4 +683,4 @@
       return APR_SUCCESS;
   }

  -#endif /* defined WIN32 */
  \ No newline at end of file
  +#endif /* defined WIN32 */



  1.29.2.1  +2 -2      httpd-2.0/os/win32/util_win32.c

  Index: util_win32.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/win32/util_win32.c,v
  retrieving revision 1.29
  retrieving revision 1.29.2.1
  diff -u -r1.29 -r1.29.2.1
  --- util_win32.c	31 Jul 2002 06:16:47 -0000	1.29
  +++ util_win32.c	8 Jan 2003 19:22:28 -0000	1.29.2.1
  @@ -57,8 +57,8 @@
    */

   #include "apr_strings.h"
  -#include "arch/win32/fileio.h"
  -#include "arch/win32/misc.h"
  +#include "arch/win32/apr_arch_file_io.h"
  +#include "arch/win32/apr_arch_misc.h"

   #include "httpd.h"
   #include "http_log.h"





Mime
View raw message