Eliminate apr_win.h and apr_winconfig.h (and the ugly #ifdefs they cause).

Now, apr.h and apr_config.h are generated from apr.hw and apr_config.hw
at build time. At this point, the server will not compile on Windows because
of the recent DSO commits. Fixing those next.

Submitted by: Bill Rowe & Bill Stoddard


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

1 files changed, 60 insertions, 4 deletions

diff --git a/apr.dsp b/apr.dsp
index 6b23169f5..3a51a4bfe 100644
--- a/apr.dsp
+++ b/apr.dsp
@@ -306,10 +306,6 @@ SOURCE=.\include\apr_time.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\apr_win.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\time\win32\atime.h
 # End Source File
 # Begin Source File
@@ -329,5 +325,65 @@ SOURCE=.\network_io\win32\networkio.h
 SOURCE=.\threadproc\win32\threadproc.h
 # End Source File
 # 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_config.h
+# End Source File
+# End Group
+# Begin Group "Internal Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\include\apr_config.hw
+
+!IF  "$(CFG)" == "aprlib - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "aprlib - Win32 Debug"
+
+# Begin Custom Build
+InputPath=.\include\apr_config.hw
+
+".\include\apr_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy .\include\apr_config.hw .\include\apr_config.h 
+	echo Created apr_config.h from apr_config.hw 
+	
+# End Custom Build
+
+!ENDIF 
+
+# 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"
+
+!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
+# End Group
 # End Target
 # End Project