A binary file is a file that cannot be parsed in ascii and must not be

  transformed.  A text file is a file that can be viewed and manipulated
  by any run of the mill text editor, can pass in and out of cvs with the
  appropriate modifications.

  Commit then review means that you propose code changes by demonstrating
  them to the tree.  This does -not- apply to major cvs changes, mass symbol
  name changes or editing the repository.  The -kb change is vetoed.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61184 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 1325 insertions, 1325 deletions

diff --git a/apr.dsp b/apr.dsp
index ebd16a0fc..2fb1ed25e 100644
--- a/apr.dsp
+++ b/apr.dsp
@@ -1,547 +1,547 @@
-# Microsoft Developer Studio Project File - Name="apr" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Static Library" 0x0104

-

-CFG=apr - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "apr.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "apr.mak" CFG="apr - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library")

-!MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-

-!IF  "$(CFG)" == "apr - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "LibR"

-# PROP BASE Intermediate_Dir "LibR"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "LibR"

-# PROP Intermediate_Dir "LibR"

-# PROP Target_Dir ""

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

-# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibR\apr" /FD /c

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ELSEIF  "$(CFG)" == "apr - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "LibD"

-# PROP BASE Intermediate_Dir "LibD"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "LibD"

-# PROP Intermediate_Dir "LibD"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-RSC=rc.exe

-# ADD BASE RSC /l 0x409

-# ADD RSC /l 0x409

-# 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 "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apr" /FD /c

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LIB32=link.exe -lib

-# ADD BASE LIB32 /nologo

-# ADD LIB32 /nologo

-

-!ENDIF 

-

-# Begin Target

-

-# Name "apr - Win32 Release"

-# Name "apr - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".c"

-# Begin Group "time"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\time\win32\access.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\atime.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\time\win32\time.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\time\win32\timestr.c

-# End Source File

-# End Group

-# Begin Group "strings"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\strings\apr_cpystrn.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\strings\apr_fnmatch.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\strings\apr_snprintf.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\strings\apr_strings.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\strings\apr_strnatcmp.c

-# End Source File

-# End Group

-# Begin Group "passwd"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\passwd\apr_getpass.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\passwd\apr_md5.c

-# End Source File

-# End Group

-# Begin Group "tables"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\tables\apr_hash.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tables\apr_tables.c

-# End Source File

-# End Group

-# Begin Group "misc"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\misc\unix\errorcodes.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\unix\getopt.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\win32\getuuid.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\win32\misc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\unix\misc.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\win32\names.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\win32\rand.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\unix\start.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\unix\uuid.c

-# End Source File

-# End Group

-# Begin Group "file_io"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\file_io\win32\canonfile.c

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\dir.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\unix\fileacc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\filedup.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\fileio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\filestat.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\flock.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\unix\fullrw.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\open.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\pipe.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\readwrite.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\seek.c

-# End Source File

-# End Group

-# Begin Group "locks"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\locks\win32\locks.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\locks.h

-# End Source File

-# End Group

-# Begin Group "network_io"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\network_io\unix\inet_ntop.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\networkio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\win32\poll.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\unix\sa_common.c

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\win32\sendrecv.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\win32\sockaddr.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\win32\sockets.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\win32\sockopt.c

-# End Source File

-# End Group

-# Begin Group "threadproc"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\threadproc\win32\proc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\threadproc\win32\signals.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\threadproc\win32\thread.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\threadproc\win32\threadpriv.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\threadproc.h

-# End Source File

-# End Group

-# Begin Group "dso"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\dso\win32\dso.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\dso.h

-# End Source File

-# End Group

-# Begin Group "lib"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\lib\apr_pools.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\lib\apr_signal.c

-# End Source File

-# End Group

-# Begin Group "i18n"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\arch\unix\i18n.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\i18n\unix\utf8_ucs2.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\i18n\unix\xlate.c

-# PROP Exclude_From_Build 1

-# End Source File

-# End Group

-# Begin Group "shmem"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\shmem\win32\shmem.c

-# PROP Exclude_From_Build 1

-# End Source File

-# End Group

-# Begin Group "mmap"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\mmap\unix\common.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\mmap\win32\mmap.c

-# End Source File

-# End Group

-# Begin Group "user"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\user\win32\groupinfo.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\user\win32\userinfo.c

-# End Source File

-# End Group

-# End Group

-# Begin Group "Generated Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\apr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr.h.in

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr.hw

-

-!IF  "$(CFG)" == "apr - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\include\apr.hw

-

-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	copy .\include\apr.hw .\include\apr.h > nul 

-	echo Created apr.h from apr.hw 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "apr - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\include\apr.hw

-

-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	copy .\include\apr.hw .\include\apr.h > nul 

-	echo Created apr.h from apr.hw 

-	

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\apr_private.h

-# End Source File

-# End Group

-# Begin Group "External Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\apr_compat.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_dso.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_errno.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_file_info.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_file_io.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_fnmatch.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_general.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_getopt.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_hash.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_lib.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_lock.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_md5.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_mmap.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_network_io.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_pools.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_portable.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_shmem.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_strings.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_tables.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_thread_proc.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_time.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_user.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_uuid.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_want.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_xlate.h

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="apr" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=apr - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "apr.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "apr.mak" CFG="apr - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "apr - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "apr - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+
+!IF  "$(CFG)" == "apr - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "LibR"
+# PROP BASE Intermediate_Dir "LibR"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "LibR"
+# PROP Intermediate_Dir "LibR"
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibR\apr" /FD /c
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "apr - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "LibD"
+# PROP BASE Intermediate_Dir "LibD"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "LibD"
+# PROP Intermediate_Dir "LibD"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+RSC=rc.exe
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+# 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 "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_STATIC" /D "WIN32" /D "_WINDOWS" /Fd"LibD\apr" /FD /c
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ENDIF 
+
+# Begin Target
+
+# Name "apr - Win32 Release"
+# Name "apr - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".c"
+# Begin Group "time"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\time\win32\access.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\atime.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\time\win32\time.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\time\win32\timestr.c
+# End Source File
+# End Group
+# Begin Group "strings"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\strings\apr_cpystrn.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_fnmatch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_snprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_strings.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_strnatcmp.c
+# End Source File
+# End Group
+# Begin Group "passwd"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\passwd\apr_getpass.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\passwd\apr_md5.c
+# End Source File
+# End Group
+# Begin Group "tables"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\tables\apr_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tables\apr_tables.c
+# End Source File
+# End Group
+# Begin Group "misc"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\misc\unix\errorcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\unix\getopt.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\getuuid.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\misc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\unix\misc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\names.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\rand.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\unix\start.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\unix\uuid.c
+# End Source File
+# End Group
+# Begin Group "file_io"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\file_io\win32\canonfile.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\dir.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\unix\fileacc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\filedup.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\fileio.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\filestat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\flock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\unix\fullrw.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\open.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\pipe.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\readwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\seek.c
+# End Source File
+# End Group
+# Begin Group "locks"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\locks\win32\locks.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\locks.h
+# End Source File
+# End Group
+# Begin Group "network_io"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\network_io\unix\inet_ntop.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\networkio.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\poll.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\unix\sa_common.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sendrecv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sockaddr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sockets.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sockopt.c
+# End Source File
+# End Group
+# Begin Group "threadproc"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\threadproc\win32\proc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\threadproc\win32\signals.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\threadproc\win32\thread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\threadproc\win32\threadpriv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\threadproc.h
+# End Source File
+# End Group
+# Begin Group "dso"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\dso\win32\dso.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\dso.h
+# End Source File
+# End Group
+# Begin Group "lib"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\lib\apr_pools.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\lib\apr_signal.c
+# End Source File
+# End Group
+# Begin Group "i18n"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\arch\unix\i18n.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\i18n\unix\utf8_ucs2.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\i18n\unix\xlate.c
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# Begin Group "shmem"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\shmem\win32\shmem.c
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# Begin Group "mmap"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\mmap\unix\common.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mmap\win32\mmap.c
+# End Source File
+# End Group
+# Begin Group "user"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\user\win32\groupinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\user\win32\userinfo.c
+# End Source File
+# End Group
+# End Group
+# Begin Group "Generated Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\apr.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr.h.in
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr.hw
+
+!IF  "$(CFG)" == "apr - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\include\apr.hw
+
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy .\include\apr.hw .\include\apr.h > nul 
+	echo Created apr.h from apr.hw 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "apr - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\include\apr.hw
+
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy .\include\apr.hw .\include\apr.h > nul 
+	echo Created apr.h from apr.hw 
+	
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\apr_private.h
+# End Source File
+# End Group
+# Begin Group "External Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\apr_compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_dso.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_errno.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_file_info.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_file_io.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_fnmatch.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_general.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_getopt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_lib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_lock.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_md5.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_mmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_network_io.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_pools.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_portable.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_shmem.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_strings.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_tables.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_thread_proc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_time.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_user.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_uuid.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_want.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_xlate.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/libapr.dsp b/libapr.dsp
index 705777288..be61aca05 100644
--- a/libapr.dsp
+++ b/libapr.dsp
@@ -1,552 +1,552 @@
-# Microsoft Developer Studio Project File - Name="libapr" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=libapr - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "libapr.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "libapr.mak" CFG="libapr - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "libapr - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "libapr - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "libapr - Win32 Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# 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 /O2 /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Release\apr" /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /map /machine:I386 /OPT:NOREF

-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /map /machine:I386 /OPT:NOREF

-

-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# 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 "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\apr" /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

-LINK32=link.exe

-# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /OPT:NOREF

-# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /OPT:NOREF

-

-!ENDIF 

-

-# Begin Target

-

-# Name "libapr - Win32 Release"

-# Name "libapr - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".c"

-# Begin Group "time"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\time\win32\access.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\atime.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\time\win32\time.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\time\win32\timestr.c

-# End Source File

-# End Group

-# Begin Group "strings"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\strings\apr_cpystrn.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\strings\apr_fnmatch.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\strings\apr_snprintf.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\strings\apr_strings.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\strings\apr_strnatcmp.c

-# End Source File

-# End Group

-# Begin Group "passwd"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\passwd\apr_getpass.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\passwd\apr_md5.c

-# End Source File

-# End Group

-# Begin Group "tables"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\tables\apr_hash.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\tables\apr_tables.c

-# End Source File

-# End Group

-# Begin Group "misc"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\misc\unix\errorcodes.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\unix\getopt.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\win32\getuuid.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\win32\misc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\unix\misc.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\win32\names.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\win32\rand.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\unix\start.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\misc\unix\uuid.c

-# End Source File

-# End Group

-# Begin Group "file_io"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\file_io\win32\canonfile.c

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\dir.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\unix\fileacc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\filedup.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\fileio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\filestat.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\flock.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\unix\fullrw.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\open.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\pipe.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\readwrite.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\file_io\win32\seek.c

-# End Source File

-# End Group

-# Begin Group "locks"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\locks\win32\locks.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\locks.h

-# End Source File

-# End Group

-# Begin Group "network_io"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\network_io\unix\inet_ntop.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\networkio.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\win32\poll.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\unix\sa_common.c

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\win32\sendrecv.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\win32\sockaddr.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\win32\sockets.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\network_io\win32\sockopt.c

-# End Source File

-# End Group

-# Begin Group "threadproc"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\threadproc\win32\proc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\threadproc\win32\signals.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\threadproc\win32\thread.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\threadproc\win32\threadpriv.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\threadproc.h

-# End Source File

-# End Group

-# Begin Group "dso"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\dso\win32\dso.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\dso.h

-# End Source File

-# End Group

-# Begin Group "lib"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\lib\apr_pools.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\lib\apr_signal.c

-# End Source File

-# End Group

-# Begin Group "i18n"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\arch\unix\i18n.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\i18n\unix\utf8_ucs2.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\i18n\unix\xlate.c

-# PROP Exclude_From_Build 1

-# End Source File

-# End Group

-# Begin Group "shmem"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\shmem\win32\shmem.c

-# PROP Exclude_From_Build 1

-# End Source File

-# End Group

-# Begin Group "mmap"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\mmap\unix\common.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\mmap\win32\mmap.c

-# End Source File

-# End Group

-# Begin Group "user"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\user\win32\groupinfo.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\user\win32\userinfo.c

-# End Source File

-# End Group

-# End Group

-# Begin Group "Generated Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\apr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr.h.in

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr.hw

-

-!IF  "$(CFG)" == "libapr - Win32 Release"

-

-# Begin Custom Build

-InputPath=.\include\apr.hw

-

-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	copy .\include\apr.hw .\include\apr.h > nul 

-	echo Created apr.h from apr.hw 

-	

-# End Custom Build

-

-!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"

-

-# Begin Custom Build

-InputPath=.\include\apr.hw

-

-".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-	copy .\include\apr.hw .\include\apr.h > nul 

-	echo Created apr.h from apr.hw 

-	

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\arch\win32\apr_private.h

-# End Source File

-# End Group

-# Begin Group "External Header Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\include\apr_compat.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_dso.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_errno.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_file_info.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_file_io.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_fnmatch.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_general.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_getopt.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_hash.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_lib.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_lock.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_md5.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_mmap.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_network_io.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_pools.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_portable.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_shmem.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_strings.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_tables.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_thread_proc.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_time.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_user.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_uuid.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_want.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\include\apr_xlate.h

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="libapr" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=libapr - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "libapr.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "libapr.mak" CFG="libapr - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "libapr - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "libapr - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "libapr - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# 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 /O2 /I "./include" /I "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "NDEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Release\apr" /FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /map /machine:I386 /OPT:NOREF
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /map /machine:I386 /OPT:NOREF
+
+!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# 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 "./include/arch" /I "./include/arch/win32" /I "./include/arch/unix" /D "_DEBUG" /D "APR_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS" /Fd"Debug\apr" /FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /OPT:NOREF
+# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib /nologo /base:"0x6EE0000" /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /OPT:NOREF
+
+!ENDIF 
+
+# Begin Target
+
+# Name "libapr - Win32 Release"
+# Name "libapr - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter ".c"
+# Begin Group "time"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\time\win32\access.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\atime.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\time\win32\time.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\time\win32\timestr.c
+# End Source File
+# End Group
+# Begin Group "strings"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\strings\apr_cpystrn.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_fnmatch.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_snprintf.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_strings.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\strings\apr_strnatcmp.c
+# End Source File
+# End Group
+# Begin Group "passwd"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\passwd\apr_getpass.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\passwd\apr_md5.c
+# End Source File
+# End Group
+# Begin Group "tables"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\tables\apr_hash.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tables\apr_tables.c
+# End Source File
+# End Group
+# Begin Group "misc"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\misc\unix\errorcodes.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\unix\getopt.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\getuuid.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\misc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\unix\misc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\names.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\win32\rand.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\unix\start.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\misc\unix\uuid.c
+# End Source File
+# End Group
+# Begin Group "file_io"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\file_io\win32\canonfile.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\dir.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\unix\fileacc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\filedup.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\fileio.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\filestat.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\flock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\unix\fullrw.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\open.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\pipe.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\readwrite.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\file_io\win32\seek.c
+# End Source File
+# End Group
+# Begin Group "locks"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\locks\win32\locks.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\locks.h
+# End Source File
+# End Group
+# Begin Group "network_io"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\network_io\unix\inet_ntop.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\networkio.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\poll.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\unix\sa_common.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sendrecv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sockaddr.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sockets.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\network_io\win32\sockopt.c
+# End Source File
+# End Group
+# Begin Group "threadproc"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\threadproc\win32\proc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\threadproc\win32\signals.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\threadproc\win32\thread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\threadproc\win32\threadpriv.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\threadproc.h
+# End Source File
+# End Group
+# Begin Group "dso"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\dso\win32\dso.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\dso.h
+# End Source File
+# End Group
+# Begin Group "lib"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\lib\apr_pools.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\lib\apr_signal.c
+# End Source File
+# End Group
+# Begin Group "i18n"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\arch\unix\i18n.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\i18n\unix\utf8_ucs2.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\i18n\unix\xlate.c
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# Begin Group "shmem"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\shmem\win32\shmem.c
+# PROP Exclude_From_Build 1
+# End Source File
+# End Group
+# Begin Group "mmap"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\mmap\unix\common.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mmap\win32\mmap.c
+# End Source File
+# End Group
+# Begin Group "user"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\user\win32\groupinfo.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\user\win32\userinfo.c
+# End Source File
+# End Group
+# End Group
+# Begin Group "Generated Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\apr.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr.h.in
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr.hw
+
+!IF  "$(CFG)" == "libapr - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\include\apr.hw
+
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy .\include\apr.hw .\include\apr.h > nul 
+	echo Created apr.h from apr.hw 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\include\apr.hw
+
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy .\include\apr.hw .\include\apr.h > nul 
+	echo Created apr.h from apr.hw 
+	
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\arch\win32\apr_private.h
+# End Source File
+# End Group
+# Begin Group "External Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\apr_compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_dso.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_errno.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_file_info.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_file_io.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_fnmatch.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_general.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_getopt.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_hash.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_lib.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_lock.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_md5.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_mmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_network_io.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_pools.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_portable.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_shmem.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_strings.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_tables.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_thread_proc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_time.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_user.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_uuid.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_want.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\apr_xlate.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/test/aprtest.dsp b/test/aprtest.dsp
index df1467804..f562131f7 100644
--- a/test/aprtest.dsp
+++ b/test/aprtest.dsp
@@ -1,179 +1,179 @@
-# Microsoft Developer Studio Project File - Name="aprtest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) External Target" 0x0106

-

-CFG=aprtest - Win32 Debug

-!MESSAGE This is not a valid makefile. To build this project using NMAKE,

-!MESSAGE use the Export Makefile command and run

-!MESSAGE 

-!MESSAGE NMAKE /f "aprtest.mak".

-!MESSAGE 

-!MESSAGE You can specify a configuration when running NMAKE

-!MESSAGE by defining the macro CFG on the command line. For example:

-!MESSAGE 

-!MESSAGE NMAKE /f "aprtest.mak" CFG="aprtest - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "aprtest - Win32 Release" (based on "Win32 (x86) External Target")

-!MESSAGE "aprtest - Win32 Debug" (based on "Win32 (x86) External Target")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-

-!IF  "$(CFG)" == "aprtest - Win32 Release"

-

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir "Release"

-# PROP BASE Intermediate_Dir "Release"

-# PROP BASE Cmd_Line "NMAKE /f Makefile"

-# PROP BASE Rebuild_Opt "/a"

-# PROP BASE Target_File "aprtest.exe"

-# PROP BASE Bsc_Name "aprtest.bsc"

-# PROP BASE Target_Dir ""

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

-# PROP Cmd_Line "NMAKE /f aprtest.win /a"

-# PROP Rebuild_Opt ""

-# PROP Bsc_Name ""

-# PROP Target_Dir ""

-

-!ELSEIF  "$(CFG)" == "aprtest - Win32 Debug"

-

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Cmd_Line "NMAKE /f aprtest.mak"

-# PROP BASE Rebuild_Opt "/a"

-# PROP BASE Target_File "aprtest.exe"

-# PROP BASE Bsc_Name "aprtest.bsc"

-# PROP BASE Target_Dir ""

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

-# PROP Cmd_Line "NMAKE /f aprtest.win /a"

-# PROP Rebuild_Opt ""

-# PROP Bsc_Name ""

-# PROP Target_Dir ""

-

-!ENDIF 

-

-# Begin Target

-

-# Name "aprtest - Win32 Release"

-# Name "aprtest - Win32 Debug"

-

-!IF  "$(CFG)" == "aprtest - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "aprtest - Win32 Debug"

-

-!ENDIF 

-

-# Begin Group "Sources"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\abc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\client.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\mod_test.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\occhild.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\sendfile.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testargs.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testcontext.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testdso.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testfile.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testflock.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testmmap.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testoc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testpipe.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testproc.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testshmem.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testsock.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testthread.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testtime.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testucs.c

-# End Source File

-# Begin Source File

-

-SOURCE=.\testuuid.c

-# End Source File

-# End Group

-# Begin Source File

-

-SOURCE=.\aprtest.win

-# End Source File

-# Begin Source File

-

-SOURCE=.\Makefile.in

-# End Source File

-# Begin Source File

-

-SOURCE=.\MakeWin32Make.pl

-# End Source File

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="aprtest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=aprtest - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "aprtest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "aprtest.mak" CFG="aprtest - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "aprtest - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "aprtest - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "aprtest - Win32 Release"
+
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /f Makefile"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "aprtest.exe"
+# PROP BASE Bsc_Name "aprtest.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "NMAKE /f aprtest.win /a"
+# PROP Rebuild_Opt ""
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "aprtest - Win32 Debug"
+
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /f aprtest.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "aprtest.exe"
+# PROP BASE Bsc_Name "aprtest.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "NMAKE /f aprtest.win /a"
+# PROP Rebuild_Opt ""
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ENDIF 
+
+# Begin Target
+
+# Name "aprtest - Win32 Release"
+# Name "aprtest - Win32 Debug"
+
+!IF  "$(CFG)" == "aprtest - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "aprtest - Win32 Debug"
+
+!ENDIF 
+
+# Begin Group "Sources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\abc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\client.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mod_test.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\occhild.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\sendfile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testargs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testcontext.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testdso.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testfile.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testflock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testmmap.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testoc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testpipe.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testproc.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testshmem.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testsock.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testthread.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testtime.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testucs.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\testuuid.c
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=.\aprtest.win
+# End Source File
+# Begin Source File
+
+SOURCE=.\Makefile.in
+# End Source File
+# Begin Source File
+
+SOURCE=.\MakeWin32Make.pl
+# End Source File
+# End Target
+# End Project
diff --git a/test/aprtest.dsw b/test/aprtest.dsw
index de81b5bea..5c02f9bdf 100644
--- a/test/aprtest.dsw
+++ b/test/aprtest.dsw
@@ -1,47 +1,47 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "apr"="..\apr.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "aprtest"=".\aprtest.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name aprlib

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name apr

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "apr"="..\apr.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "aprtest"=".\aprtest.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name aprlib
+    End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name apr
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+