Changes to get Win32 compiling again, including substituting

  apr_string.h for apr_lib.h, fix some bad linkage declarations,
  and some more comments on threadproc/win32/proc.c


PR:
Obtained from:
Submitted by:
Reviewed by:


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

1 files changed, 120 insertions, 102 deletions

diff --git a/apr.dsp b/apr.dsp
index be34fd83b..fd30b5d35 100644
--- a/apr.dsp
+++ b/apr.dsp
@@ -68,8 +68,8 @@ LIB32=link.exe -lib
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "_DEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c
+# ADD BASE CPP /nologo /MTd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "include" /I "dso/win32" /I "file_io/win32" /I "locks/win32" /I "misc/win32" /I "misc/unix" /I "network_io/win32" /I "threadproc/win32" /I "time/win32" /D "_DEBUG" /D "APR_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /FD /c
 # SUBTRACT CPP /YX
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
@@ -93,23 +93,23 @@ SOURCE=.\time\win32\access.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\lib\apr_cpystrn.c
+SOURCE=.\strings\apr_cpystrn.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\lib\apr_execve.c
+SOURCE=.\strings\apr_fnmatch.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\lib\apr_fnmatch.c
+SOURCE=.\passwd\apr_getpass.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\lib\apr_getpass.c
+SOURCE=.\tables\apr_hash.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\lib\apr_md5.c
+SOURCE=.\passwd\apr_md5.c
 # End Source File
 # Begin Source File
 
@@ -117,19 +117,23 @@ SOURCE=.\lib\apr_pools.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\lib\apr_snprintf.c
+SOURCE=.\lib\apr_signal.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\lib\apr_strnatcmp.c
+SOURCE=.\strings\apr_snprintf.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\lib\apr_tables.c
+SOURCE=.\strings\apr_strings.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\aprlib.def
+SOURCE=.\strings\apr_strnatcmp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\tables\apr_tables.c
 # End Source File
 # Begin Source File
 
@@ -209,6 +213,11 @@ SOURCE=.\network_io\win32\sendrecv.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\shmem\win32\shmem.c
+# PROP Exclude_From_Build 1
+# End Source File
+# Begin Source File
+
 SOURCE=.\threadproc\win32\signals.c
 # End Source File
 # Begin Source File
@@ -244,191 +253,200 @@ SOURCE=.\time\win32\time.c
 SOURCE=.\time\win32\timestr.c
 # End Source File
 # End Group
-# Begin Group "Header Files"
+# Begin Group "Generated Header Files"
 
-# PROP Default_Filter ".h"
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\include\apr_dso.h
+SOURCE=.\include\apr.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_errno.h
+SOURCE=.\include\apr_private.h
 # End Source File
+# End Group
+# Begin Group "Internal Header Files"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\include\apr_file_io.h
+SOURCE=.\include\apr_private.hw
+
+!IF  "$(CFG)" == "aprlib - Win32 Release"
+
+# Begin Custom Build
+InputPath=.\include\apr_private.hw
+
+".\include\apr_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy .\include\apr_private.hw .\include\apr_private.h > nul 
+	echo Created apr_private.h from apr_private.hw 
+	
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\include\apr_private.hw
+
+".\include\apr_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy .\include\apr_private.hw .\include\apr_private.h > nul 
+	echo Created apr_private.h from apr_private.hw 
+	
+# End Custom Build
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_fnmatch.h
+SOURCE=.\time\win32\atime.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_general.h
+SOURCE=.\dso\win32\dso.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_getopt.h
+SOURCE=.\file_io\win32\fileio.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_lib.h
+SOURCE=.\locks\win32\locks.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_lock.h
+SOURCE=.\misc\unix\misc.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_md5.h
+SOURCE=.\network_io\win32\networkio.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_network_io.h
+SOURCE=.\threadproc\win32\threadproc.h
 # End Source File
+# End Group
+# Begin Group "External Header Files"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\include\apr_pools.h
+SOURCE=.\include\apr.h.in
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_portable.h
+SOURCE=.\include\apr.hw
+
+!IF  "$(CFG)" == "aprlib - 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)" == "aprlib - 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\apr_shmem.h
+SOURCE=.\include\apr_dso.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_signal.h
+SOURCE=.\include\apr_errno.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_strnatcmp.h
+SOURCE=.\include\apr_file_io.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_tables.h
+SOURCE=.\include\apr_fnmatch.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_thread_proc.h
+SOURCE=.\include\apr_general.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_time.h
+SOURCE=.\include\apr_getopt.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_xlate.h
+SOURCE=.\include\apr_hash.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\time\win32\atime.h
+SOURCE=.\include\apr_lib.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\dso\win32\dso.h
+SOURCE=.\include\apr_lock.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_io\win32\fileio.h
+SOURCE=.\include\apr_md5.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\locks\win32\locks.h
+SOURCE=.\include\apr_mmap.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\misc\unix\misc.h
+SOURCE=.\include\apr_network_io.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\network_io\win32\networkio.h
+SOURCE=.\include\apr_pools.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\threadproc\win32\threadproc.h
+SOURCE=.\include\apr_portable.h
 # End Source File
-# End Group
-# Begin Group "Generated Header Files"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\include\apr.h
+SOURCE=.\include\apr_shmem.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_private.h
+SOURCE=.\include\apr_strings.h
 # End Source File
-# End Group
-# Begin Group "Internal Header Files"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\include\apr_private.hw
-
-!IF  "$(CFG)" == "aprlib - Win32 Release"
-
-# Begin Custom Build
-InputPath=.\include\apr_private.hw
-
-".\include\apr_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy .\include\apr_private.hw .\include\apr_private.h > nul 
-	echo Created apr_private.h from apr_private.hw 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
-
-# Begin Custom Build
-InputPath=.\include\apr_private.hw
+SOURCE=.\include\apr_tables.h
+# End Source File
+# Begin Source File
 
-".\include\apr_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy .\include\apr_private.hw .\include\apr_private.h > nul 
-	echo Created apr_private.h from apr_private.hw 
-	
-# End Custom Build
+SOURCE=.\include\apr_thread_proc.h
+# End Source File
+# Begin Source File
 
-!ENDIF 
+SOURCE=.\include\apr_time.h
+# End Source File
+# Begin Source File
 
+SOURCE=.\include\apr_xlate.h
 # End Source File
 # End Group
-# Begin Group "External Header Files"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\include\apr.hw
-
-!IF  "$(CFG)" == "aprlib - 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)" == "aprlib - 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 
-
+SOURCE=.\aprlib.def
+# PROP Exclude_From_Build 1
 # End Source File
-# End Group
 # End Target
 # End Project