httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apache-1.3/src/os/win32/installer/installdll/test test.dsp
Date Wed, 14 Feb 2001 14:22:17 GMT
wrowe       01/02/14 06:22:17

  Modified:    src/os/win32 ApacheOS.dsp Win9xConHook.c Win9xConHook.dsp
                        Win9xConHook.h getopt.c getopt.h main_win32.c
                        mod_auth_anon.dsp mod_auth_dbm.dsp
                        mod_auth_digest.dsp mod_cern_meta.dsp
                        mod_digest.dsp mod_expires.dsp mod_headers.dsp
                        mod_info.dsp mod_isapi.c mod_proxy.dsp
                        mod_rewrite.dsp mod_speling.dsp mod_status.dsp
                        mod_usertrack.dsp modules.c multithread.c os.c os.h
                        passwd.c passwd.h readdir.c readdir.h registry.c
                        registry.h service.c service.h util_win32.c
               src/os/win32/installer/installdll install.dsp
               src/os/win32/installer/installdll/test test.dsp
  Removed:     src/os/win32 MakeModuleMak.mak
  Log:
    Massive commit to clean up os/win32 and label some files with the
    appropriate license blocks and #ifdef WIN32 wrappers.
  
  Revision  Changes    Path
  1.10      +3 -4      apache-1.3/src/os/win32/ApacheOS.dsp
  
  Index: ApacheOS.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/ApacheOS.dsp,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ApacheOS.dsp	2000/12/19 23:21:47	1.9
  +++ ApacheOS.dsp	2001/02/14 14:22:06	1.10
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="ApacheOS" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Static Library" 0x0104
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -60,8 +59,8 @@
   # PROP Output_Dir "LibD"
   # PROP Intermediate_Dir "LibD"
   # 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 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"LibD\ApacheOS" /FD /c
  +# 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 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fd"LibD\ApacheOS" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  
  
  
  1.9       +2 -1      apache-1.3/src/os/win32/Win9xConHook.c
  
  Index: Win9xConHook.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/Win9xConHook.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Win9xConHook.c	2001/01/15 17:06:27	1.8
  +++ Win9xConHook.c	2001/02/14 14:22:07	1.9
  @@ -56,6 +56,7 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  +#ifdef WIN32
   
   /*
    * Win9xConHook.dll - a hook proc to clean up Win95/98 console behavior.
  @@ -735,4 +736,4 @@
   }
   #endif
   
  -
  +#endif /* WIN32 */
  
  
  
  1.4       +3 -4      apache-1.3/src/os/win32/Win9xConHook.dsp
  
  Index: Win9xConHook.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/Win9xConHook.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Win9xConHook.dsp	2000/12/19 23:22:06	1.3
  +++ Win9xConHook.dsp	2001/02/14 14:22:07	1.4
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="Win9xConHook" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\Win9xConHook" /FD /c
  +# 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 /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\Win9xConHook" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.5       +8 -0      apache-1.3/src/os/win32/Win9xConHook.h
  
  Index: Win9xConHook.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/Win9xConHook.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Win9xConHook.h	2001/01/15 17:06:28	1.4
  +++ Win9xConHook.h	2001/02/14 14:22:07	1.5
  @@ -56,7 +56,11 @@
    * University of Illinois, Urbana-Champaign.
    */
   
  +#ifndef AP_WIN9XCONHOOK_H
  +#define AP_WIN9XCONHOOK_H
   
  +#ifdef WIN32
  +
   /* Windows9xServiceCtrlHandler registers a handler routine, frees the
    * console window, and registers this process as a service in Win9x.
    * It creats a hidden window of class "ApacheWin95ServiceMonitor"
  @@ -89,3 +93,7 @@
    *
    * LRESULT CALLBACK CallWndProc(INT hc, WPARAM wParam, LPARAM lParam);
    */
  +
  +#endif /* WIN32 */
  +
  +#endif AP_WIN9XCONHOOK_H
  \ No newline at end of file
  
  
  
  1.3       +63 -5     apache-1.3/src/os/win32/getopt.c
  
  Index: getopt.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/getopt.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- getopt.c	2000/12/27 19:39:18	1.2
  +++ getopt.c	2001/02/14 14:22:07	1.3
  @@ -1,10 +1,68 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
  +#ifdef WIN32
  +
   #include <stdio.h>
   #include <string.h>
   #include <assert.h>
   #include <stdlib.h>
   
  -#ifdef WIN32
  -
   #define OPTERRCOLON (1)
   #define OPTERRNF (2)
   #define OPTERRARG (3)
  @@ -125,8 +183,6 @@
       return(0);
   }
   
  -#endif /* WIN32 */
  -
   #ifdef TESTGETOPT
   int
    main (int argc, char **argv)
  @@ -170,4 +226,6 @@
         return 0;
    }
   
  -#endif /* TESTGETOPT */
  \ No newline at end of file
  +#endif /* TESTGETOPT */
  +
  +#endif /* WIN32 */
  
  
  
  1.3       +62 -0     apache-1.3/src/os/win32/getopt.h
  
  Index: getopt.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/getopt.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- getopt.h	2000/12/27 19:39:18	1.2
  +++ getopt.h	2001/02/14 14:22:07	1.3
  @@ -1,11 +1,73 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
   #ifndef GETOPT_H
   #define GETOPT_H
   
  +#ifdef WIN32
  +
   extern char *optarg;
   extern int optreset;
   extern int optind;
   extern int opterr;
   extern int optopt;
   int getopt(int argc, char* const *argv, const char *optstr);
  +
  +#endif /* WIN32 */
   
   #endif /* GETOPT_H */
  
  
  
  1.3       +62 -0     apache-1.3/src/os/win32/main_win32.c
  
  Index: main_win32.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/main_win32.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- main_win32.c	1997/11/26 23:52:10	1.2
  +++ main_win32.c	2001/02/14 14:22:07	1.3
  @@ -1,3 +1,63 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
  +#ifdef WIN32
  +
   /* main_win32.c - Apache executable stub file for Win32
    * This file's purpose in life is to load, and call the
    * "real" main function, apache_main(), located in ApacheCore.dll
  @@ -14,3 +74,5 @@
   {
       return apache_main(argc, argv);
   }
  +
  +#endif /* WIN32 */
  \ No newline at end of file
  
  
  
  1.14      +3 -4      apache-1.3/src/os/win32/mod_auth_anon.dsp
  
  Index: mod_auth_anon.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_auth_anon.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_auth_anon.dsp	2000/12/20 23:48:52	1.13
  +++ mod_auth_anon.dsp	2001/02/14 14:22:08	1.14
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_auth_anon" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_anon" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_anon" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.7       +3 -4      apache-1.3/src/os/win32/mod_auth_dbm.dsp
  
  Index: mod_auth_dbm.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_auth_dbm.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_auth_dbm.dsp	2001/01/21 01:25:17	1.6
  +++ mod_auth_dbm.dsp	2001/02/14 14:22:08	1.7
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_auth_dbm" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /I "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_dbm" /FD /c
  +# 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 "..\..\os\win32" /I "..\..\lib\sdbm" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_dbm" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.7       +3 -4      apache-1.3/src/os/win32/mod_auth_digest.dsp
  
  Index: mod_auth_digest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_auth_digest.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mod_auth_digest.dsp	2000/12/20 23:48:53	1.6
  +++ mod_auth_digest.dsp	2001/02/14 14:22:08	1.7
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_auth_digest" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_digest" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_auth_digest" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  
  
  
  1.14      +3 -4      apache-1.3/src/os/win32/mod_cern_meta.dsp
  
  Index: mod_cern_meta.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_cern_meta.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_cern_meta.dsp	2000/12/20 23:48:53	1.13
  +++ mod_cern_meta.dsp	2001/02/14 14:22:08	1.14
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_cern_meta" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_cern_meta" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_cern_meta" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.14      +3 -4      apache-1.3/src/os/win32/mod_digest.dsp
  
  Index: mod_digest.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_digest.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_digest.dsp	2000/12/20 23:48:54	1.13
  +++ mod_digest.dsp	2001/02/14 14:22:08	1.14
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_digest" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_digest" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_digest" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.14      +3 -4      apache-1.3/src/os/win32/mod_expires.dsp
  
  Index: mod_expires.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_expires.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_expires.dsp	2000/12/20 23:48:54	1.13
  +++ mod_expires.dsp	2001/02/14 14:22:08	1.14
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_expires" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_expires" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_expires" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.14      +3 -4      apache-1.3/src/os/win32/mod_headers.dsp
  
  Index: mod_headers.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_headers.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_headers.dsp	2000/12/20 23:48:54	1.13
  +++ mod_headers.dsp	2001/02/14 14:22:08	1.14
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_headers" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_headers" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_headers" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.14      +3 -4      apache-1.3/src/os/win32/mod_info.dsp
  
  Index: mod_info.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_info.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_info.dsp	2000/12/20 23:48:54	1.13
  +++ mod_info.dsp	2001/02/14 14:22:09	1.14
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_info" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_info" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_info" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.28      +4 -0      apache-1.3/src/os/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_isapi.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- mod_isapi.c	2001/01/15 17:06:28	1.27
  +++ mod_isapi.c	2001/02/14 14:22:09	1.28
  @@ -75,6 +75,8 @@
    * the ISA is in.
    */
   
  +#ifdef WIN32
  +
   /* A lousy hack to include ap_check_cmd_context(): */
   #define CORE_PRIVATE 
   
  @@ -926,3 +928,5 @@
      NULL,                        /* logger */
      NULL                         /* header parser */
   };
  +
  +#endif /* WIN32 */
  
  
  
  1.20      +3 -4      apache-1.3/src/os/win32/mod_proxy.dsp
  
  Index: mod_proxy.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_proxy.dsp,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- mod_proxy.dsp	2001/02/06 22:44:09	1.19
  +++ mod_proxy.dsp	2001/02/14 14:22:09	1.20
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_proxy" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /I "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\mod_proxy" /FD /c
  +# 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 "..\..\os\win32" /I "..\..\modules\proxy" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\mod_proxy" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.18      +3 -4      apache-1.3/src/os/win32/mod_rewrite.dsp
  
  Index: mod_rewrite.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_rewrite.dsp,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- mod_rewrite.dsp	2000/12/20 23:48:55	1.17
  +++ mod_rewrite.dsp	2001/02/14 14:22:09	1.18
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_rewrite" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\mod_rewrite" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "NO_DBM_REWRITEMAP" /D "SHARED_MODULE" /D "WIN32_LEAN_AND_MEAN" /Fd"Debug\mod_rewrite" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.11      +3 -4      apache-1.3/src/os/win32/mod_speling.dsp
  
  Index: mod_speling.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_speling.dsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- mod_speling.dsp	2000/12/20 23:48:56	1.10
  +++ mod_speling.dsp	2001/02/14 14:22:09	1.11
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_speling" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_speling" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_speling" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.14      +3 -4      apache-1.3/src/os/win32/mod_status.dsp
  
  Index: mod_status.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_status.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_status.dsp	2000/12/20 23:48:56	1.13
  +++ mod_status.dsp	2001/02/14 14:22:09	1.14
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_status" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_status" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_status" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.14      +3 -4      apache-1.3/src/os/win32/mod_usertrack.dsp
  
  Index: mod_usertrack.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/mod_usertrack.dsp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- mod_usertrack.dsp	2000/12/20 23:48:56	1.13
  +++ mod_usertrack.dsp	2001/02/14 14:22:09	1.14
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="mod_usertrack" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_usertrack" /FD /c
  +# 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 "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "SHARED_MODULE" /Fd"Debug\mod_usertrack" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.10      +62 -0     apache-1.3/src/os/win32/modules.c
  
  Index: modules.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/modules.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- modules.c	1998/07/21 00:06:59	1.9
  +++ modules.c	2001/02/14 14:22:09	1.10
  @@ -1,8 +1,68 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
   /* modules.c --- major modules compiled into Apache for Win32.
    * Only insert an entry for a module if it must be compiled into
    * the core server
    */
   
  +#ifdef WIN32
  +
   #include "httpd.h"
   #include "http_config.h"
   
  @@ -70,3 +130,5 @@
     &isapi_module,
     NULL
   };
  +
  +#endif /* WIN32 */
  
  
  
  1.6       +59 -2     apache-1.3/src/os/win32/multithread.c
  
  Index: multithread.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/multithread.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- multithread.c	1998/07/13 11:32:51	1.5
  +++ multithread.c	2001/02/14 14:22:09	1.6
  @@ -1,11 +1,68 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
   
  +#ifdef WIN32
  +
   #include "ap_config.h"
   #include "multithread.h"
   
  -#ifdef WIN32
   #include <process.h>
   #include <assert.h>
  -
   
   static int
   map_rv(int rv)
  
  
  
  1.4       +58 -0     apache-1.3/src/os/win32/os.c
  
  Index: os.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/os.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- os.c	1997/09/14 12:09:49	1.3
  +++ os.c	2001/02/14 14:22:10	1.4
  @@ -1,3 +1,61 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
   /*
    * OS abstraction functions. Small functions should be defined
    * as "__inline" in os.h.
  
  
  
  1.39      +4 -0      apache-1.3/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/os.h,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- os.h	2001/01/15 17:06:29	1.38
  +++ os.h	2001/02/14 14:22:10	1.39
  @@ -59,6 +59,8 @@
   #ifndef APACHE_OS_H
   #define APACHE_OS_H
   
  +#ifdef WIN32
  +
   /* 
    * Compile the server including all the Windows NT 4.0 header files by 
    * default. We still want the server to run on Win95/98 so use 
  @@ -204,5 +206,7 @@
   
   /* Other ap_os_ routines not used by this platform */
   #define ap_os_kill(pid, sig)                kill(pid, sig)
  +
  +#endif /* WIN32 */
   
   #endif   /* ! APACHE_OS_H */
  
  
  
  1.3       +62 -0     apache-1.3/src/os/win32/passwd.c
  
  Index: passwd.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/passwd.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- passwd.c	2000/12/20 00:08:52	1.2
  +++ passwd.c	2001/02/14 14:22:10	1.3
  @@ -1,3 +1,63 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
  +#ifdef WIN32
  +
   #include <stdio.h>
   #include <string.h>
   #include "passwd.h"
  @@ -15,3 +75,5 @@
   
       return &pw;
   }
  +
  +#endif /* WIN32 */
  \ No newline at end of file
  
  
  
  1.2       +67 -0     apache-1.3/src/os/win32/passwd.h
  
  Index: passwd.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/passwd.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- passwd.h	1997/08/31 16:43:18	1.1
  +++ passwd.h	2001/02/14 14:22:10	1.2
  @@ -1,3 +1,66 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
  +#ifndef APACHE_PASSWD_H
  +#define APACHE_PASSWD_H
  +
  +#ifdef WIN32
  +
   #include <stdlib.h>
   
   struct passwd
  @@ -6,3 +69,7 @@
   };
   
   struct passwd *getpwnam(const char *szUser);
  +
  +#endif /* WIN32 */
  +
  +#endif /* ndef APACHE_PASSWD_H */
  
  
  
  1.4       +62 -0     apache-1.3/src/os/win32/readdir.c
  
  Index: readdir.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/readdir.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- readdir.c	1997/07/15 22:36:58	1.3
  +++ readdir.c	2001/02/14 14:22:10	1.4
  @@ -1,3 +1,63 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
  +#ifdef WIN32
  +
   #include <malloc.h>
   #include <string.h>
   #include <errno.h>
  @@ -78,3 +138,5 @@
   
       return 0;
   }
  +
  +#endif /* WIN32 */
  
  
  
  1.6       +62 -0     apache-1.3/src/os/win32/readdir.h
  
  Index: readdir.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/readdir.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- readdir.h	2000/06/30 20:38:26	1.5
  +++ readdir.h	2001/02/14 14:22:10	1.6
  @@ -1,3 +1,61 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
   /*
    * Structures and types used to implement opendir/readdir/closedir
    * on Windows 95/NT.
  @@ -6,6 +64,8 @@
   #ifndef APACHE_READDIR_H
   #define APACHE_READDIR_H
   
  +#ifdef WIN32
  +
   #include <io.h>
   #include <stdio.h>
   #include <stdlib.h>
  @@ -37,5 +97,7 @@
   API_EXPORT(DIR *) opendir(const char *);
   API_EXPORT(struct dirent *) readdir(DIR *);
   API_EXPORT(int) closedir(DIR *);
  +
  +#endif /* WIN32 */
   
   #endif /* ndef APACHE_READDIR_H */
  
  
  
  1.36      +60 -0     apache-1.3/src/os/win32/registry.c
  
  Index: registry.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/registry.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- registry.c	2000/12/27 21:45:13	1.35
  +++ registry.c	2001/02/14 14:22:10	1.36
  @@ -1,3 +1,62 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
  +#ifdef WIN32
   /*
    * Functions to handle interacting with the Win32 registry
    */
  @@ -548,3 +607,4 @@
       return ret;
   }
   
  +#endif /* WIN32 */
  \ No newline at end of file
  
  
  
  1.6       +67 -0     apache-1.3/src/os/win32/registry.h
  
  Index: registry.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/registry.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- registry.h	2000/12/27 21:45:13	1.5
  +++ registry.h	2001/02/14 14:22:11	1.6
  @@ -1,3 +1,66 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
  +#ifndef APACHE_REGISTRY_H
  +#define APACHE_REGISTRY_H
  +
  +#ifdef WIN32
  +
   /*
    * Declarations for users of the functions defined in registry.c
    */
  @@ -6,3 +69,7 @@
   extern int ap_registry_set_server_root(char *dir);
   extern int ap_registry_get_service_args(pool *p, int *argc, char ***argv, char *display_name);
   extern int ap_registry_set_service_args(pool *p, int argc, char **argv, char *display_name);
  +
  +#endif WIN32
  +
  +#endif APACHE_REGISTRY_H
  \ No newline at end of file
  
  
  
  1.42      +1 -1      apache-1.3/src/os/win32/service.c
  
  Index: service.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/service.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- service.c	2001/02/14 09:54:47	1.41
  +++ service.c	2001/02/14 14:22:11	1.42
  @@ -1292,5 +1292,5 @@
           return TRUE;
       return FALSE;
   }
  -#endif /* WIN32 */
   
  +#endif /* WIN32 */
  
  
  
  1.18      +1 -0      apache-1.3/src/os/win32/service.h
  
  Index: service.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/service.h,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- service.h	2001/02/14 09:54:48	1.17
  +++ service.h	2001/02/14 14:22:11	1.18
  @@ -88,6 +88,7 @@
   BOOL isWindowsNT(void);
   void ap_start_console_monitor(void);
   void ap_start_child_console(int is_child_of_service);
  +
   #endif /* WIN32 */
   
   #endif /* SERVICE_H */
  
  
  
  1.42      +63 -1     apache-1.3/src/os/win32/util_win32.c
  
  Index: util_win32.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/util_win32.c,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- util_win32.c	2000/11/14 00:25:17	1.41
  +++ util_win32.c	2001/02/14 14:22:11	1.42
  @@ -1,3 +1,63 @@
  +/* ====================================================================
  + * The Apache Software License, Version 1.1
  + *
  + * Copyright (c) 2000 The Apache Software Foundation.  All rights
  + * reserved.
  + *
  + * Redistribution and use in source and binary forms, with or without
  + * modification, are permitted provided that the following conditions
  + * are met:
  + *
  + * 1. Redistributions of source code must retain the above copyright
  + *    notice, this list of conditions and the following disclaimer.
  + *
  + * 2. Redistributions in binary form must reproduce the above copyright
  + *    notice, this list of conditions and the following disclaimer in
  + *    the documentation and/or other materials provided with the
  + *    distribution.
  + *
  + * 3. The end-user documentation included with the redistribution,
  + *    if any, must include the following acknowledgment:
  + *       "This product includes software developed by the
  + *        Apache Software Foundation (http://www.apache.org/)."
  + *    Alternately, this acknowledgment may appear in the software itself,
  + *    if and wherever such third-party acknowledgments normally appear.
  + *
  + * 4. The names "Apache" and "Apache Software Foundation" must
  + *    not be used to endorse or promote products derived from this
  + *    software without prior written permission. For written
  + *    permission, please contact apache@apache.org.
  + *
  + * 5. Products derived from this software may not be called "Apache",
  + *    nor may "Apache" appear in their name, without prior written
  + *    permission of the Apache Software Foundation.
  + *
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  + * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  + * SUCH DAMAGE.
  + * ====================================================================
  + *
  + * This software consists of voluntary contributions made by many
  + * individuals on behalf of the Apache Software Foundation.  For more
  + * information on the Apache Software Foundation, please see
  + * <http://www.apache.org/>.
  + *
  + * Portions of this software are based upon public domain software
  + * originally written at the National Center for Supercomputing Applications,
  + * University of Illinois, Urbana-Champaign.
  + */
  +
  +#ifdef WIN32
  +
   #include <windows.h>
   #include <sys/stat.h>
   #include <stdarg.h>
  @@ -765,4 +825,6 @@
           errstr[len-1] = ' ';
       }
       return errstr;
  -}
  \ No newline at end of file
  +}
  +
  +#endif /* WIN32 */
  \ No newline at end of file
  
  
  
  1.7       +3 -4      apache-1.3/src/os/win32/installer/installdll/install.dsp
  
  Index: install.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/installer/installdll/install.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- install.dsp	2000/09/21 13:29:10	1.6
  +++ install.dsp	2001/02/14 14:22:16	1.7
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="install" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  
  1.3       +3 -4      apache-1.3/src/os/win32/installer/installdll/test/test.dsp
  
  Index: test.dsp
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/installer/installdll/test/test.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- test.dsp	2000/06/08 14:18:40	1.2
  +++ test.dsp	2001/02/14 14:22:17	1.3
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="test" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Application" 0x0101
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
  +# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32
   # ADD BASE RSC /l 0x809 /d "_DEBUG"
  
  
  

Mime
View raw message