Reorganize these projects just a bit, and sort the sources.

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

1 files changed, 114 insertions, 109 deletions

diff --git a/apr.dsp b/apr.dsp
index e966aa786..0cc8dc5aa 100644
--- a/apr.dsp
+++ b/apr.dsp
@@ -84,76 +84,105 @@ LIB32=link.exe -lib
 # Begin Group "Source Files"
 
 # PROP Default_Filter ".c"
-# Begin Group "time"
+# Begin Group "dso"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\time\win32\access.c
+SOURCE=.\dso\win32\dso.c
 # End Source File
+# End Group
+# Begin Group "file_io"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\include\arch\win32\atime.h
+SOURCE=.\file_io\win32\dir.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\time\win32\time.c
+SOURCE=.\file_io\unix\fileacc.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\time\win32\timestr.c
+SOURCE=.\file_io\win32\filedup.c
 # End Source File
-# End Group
-# Begin Group "strings"
+# Begin Source File
 
-# PROP Default_Filter ""
+SOURCE=.\file_io\win32\filepath.c
+# End Source File
 # Begin Source File
 
-SOURCE=.\strings\apr_cpystrn.c
+SOURCE=.\file_io\win32\filestat.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strings\apr_fnmatch.c
+SOURCE=.\file_io\win32\flock.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strings\apr_snprintf.c
+SOURCE=.\file_io\unix\fullrw.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strings\apr_strings.c
+SOURCE=.\file_io\win32\open.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strings\apr_strnatcmp.c
+SOURCE=.\file_io\win32\pipe.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\strings\apr_strtok.c
+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 "passwd"
+# Begin Group "i18n"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\passwd\apr_getpass.c
+SOURCE=.\i18n\unix\utf8_ucs2.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\passwd\apr_md5.c
+SOURCE=.\i18n\unix\xlate.c
+# PROP Exclude_From_Build 1
 # End Source File
 # End Group
-# Begin Group "tables"
+# Begin Group "locks"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\tables\apr_hash.c
+SOURCE=.\locks\win32\locks.c
 # End Source File
+# End Group
+# Begin Group "memory"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\tables\apr_tables.c
+SOURCE=.\memory\unix\apr_pools.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\memory\unix\apr_sms.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\memory\unix\apr_sms_blocks.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\memory\unix\apr_sms_std.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\memory\unix\apr_sms_tracking.c
 # End Source File
 # End Group
 # Begin Group "misc"
@@ -177,10 +206,6 @@ 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
@@ -200,109 +225,114 @@ SOURCE=.\misc\unix\start.c
 SOURCE=.\misc\unix\uuid.c
 # End Source File
 # End Group
-# Begin Group "file_io"
+# Begin Group "mmap"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\file_io\win32\dir.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\file_io\unix\fileacc.c
+SOURCE=.\mmap\unix\common.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_io\win32\filedup.c
+SOURCE=.\mmap\win32\mmap.c
 # End Source File
-# Begin Source File
+# End Group
+# Begin Group "network_io"
 
-SOURCE=.\include\arch\win32\fileio.h
-# End Source File
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\file_io\win32\filepath.c
+SOURCE=.\network_io\unix\inet_ntop.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_io\win32\filestat.c
+SOURCE=.\network_io\unix\inet_pton.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_io\win32\flock.c
+SOURCE=.\network_io\win32\poll.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_io\unix\fullrw.c
+SOURCE=.\network_io\unix\sa_common.c
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_io\win32\open.c
+SOURCE=.\network_io\win32\sendrecv.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_io\win32\pipe.c
+SOURCE=.\network_io\win32\sockaddr.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_io\win32\readwrite.c
+SOURCE=.\network_io\win32\sockets.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\file_io\win32\seek.c
+SOURCE=.\network_io\win32\sockopt.c
 # End Source File
 # End Group
-# Begin Group "locks"
+# Begin Group "passwd"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\locks\win32\locks.c
+SOURCE=.\passwd\apr_getpass.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\arch\win32\locks.h
+SOURCE=.\passwd\apr_md5.c
 # End Source File
 # End Group
-# Begin Group "network_io"
+# Begin Group "shmem"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\network_io\unix\inet_ntop.c
+SOURCE=.\shmem\win32\shmem.c
+# PROP Exclude_From_Build 1
 # End Source File
+# End Group
+# Begin Group "strings"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\network_io\unix\inet_pton.c
+SOURCE=.\strings\apr_cpystrn.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\arch\win32\networkio.h
+SOURCE=.\strings\apr_fnmatch.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\network_io\win32\poll.c
+SOURCE=.\strings\apr_snprintf.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\network_io\unix\sa_common.c
-# PROP Exclude_From_Build 1
+SOURCE=.\strings\apr_strings.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\network_io\win32\sendrecv.c
+SOURCE=.\strings\apr_strnatcmp.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\network_io\win32\sockaddr.c
+SOURCE=.\strings\apr_strtok.c
 # End Source File
+# End Group
+# Begin Group "tables"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\network_io\win32\sockets.c
+SOURCE=.\tables\apr_hash.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\network_io\win32\sockopt.c
+SOURCE=.\tables\apr_tables.c
 # End Source File
 # End Group
 # Begin Group "threadproc"
@@ -324,108 +354,87 @@ SOURCE=.\threadproc\win32\thread.c
 
 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"
+# Begin Group "time"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\dso\win32\dso.c
+SOURCE=.\time\win32\access.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\arch\win32\dso.h
+SOURCE=.\time\win32\time.c
 # End Source File
-# End Group
-# Begin Group "i18n"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\include\arch\unix\i18n.h
+SOURCE=.\time\win32\timestr.c
 # End Source File
+# End Group
+# Begin Group "user"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\i18n\unix\utf8_ucs2.c
+SOURCE=.\user\win32\groupinfo.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\i18n\unix\xlate.c
-# PROP Exclude_From_Build 1
+SOURCE=.\user\win32\userinfo.c
 # End Source File
 # End Group
-# Begin Group "shmem"
+# End Group
+# Begin Group "Internal Header Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\shmem\win32\shmem.c
-# PROP Exclude_From_Build 1
+SOURCE=.\include\arch\win32\apr_private.h
 # End Source File
-# End Group
-# Begin Group "mmap"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\mmap\unix\common.c
+SOURCE=.\include\arch\win32\atime.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\mmap\win32\mmap.c
+SOURCE=.\include\arch\win32\dso.h
 # End Source File
-# End Group
-# Begin Group "user"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\user\win32\groupinfo.c
+SOURCE=.\include\arch\win32\fileio.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\user\win32\userinfo.c
+SOURCE=.\include\arch\unix\i18n.h
 # End Source File
-# End Group
-# Begin Group "memory"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\memory\unix\apr_pools.c
+SOURCE=.\include\arch\unix\inherit.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\memory\unix\apr_sms.c
+SOURCE=.\include\arch\win32\locks.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\memory\unix\apr_sms_blocks.c
+SOURCE=.\include\arch\unix\misc.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\memory\unix\apr_sms_std.c
+SOURCE=.\include\arch\win32\networkio.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\memory\unix\apr_sms_tracking.c
+SOURCE=.\include\arch\win32\threadproc.h
 # End Source File
 # End Group
-# End Group
-# Begin Group "Generated Header Files"
+# Begin Group "External Header Files"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\include\apr.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\include\apr.h.in
+# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
@@ -458,14 +467,6 @@ InputPath=.\include\apr.hw
 # 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
@@ -502,6 +503,10 @@ SOURCE=.\include\apr_hash.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\apr_inherit.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\apr_lib.h
 # End Source File
 # Begin Source File