William A. Rowe Jr. wrote: > Folks, > > Please review the attached delta of apr 1.3 to 1.4 changes and > chime in if you believe we are ready to tag 1.4. I suspect we are. > > Thanks! > >
Since there were no objections to the original trunk commit and responses to my pings on-list, I merged r821306 from trunk to the 1.4 branch. Index: CHANGES =================================================================== --- CHANGES (revision 885698) +++ CHANGES (revision 885699) @@ -34,6 +34,9 @@ *) Add apr_file_link() function. PR 44841. [Mark Heily <mark heily.com>] + *) Win32: Properly handle the ERROR_DIRECTORY system error code. + [Brane Čibej] + Changes for APR 1.3.x and later: *) http://svn.apache.org/viewvc/apr/apr/branches/1.3.x/CHANGES?view=markup Index: include/apr_errno.h =================================================================== --- include/apr_errno.h (revision 885698) +++ include/apr_errno.h (revision 885699) @@ -1046,7 +1046,8 @@ || (s) == APR_OS_START_SYSERR + ERROR_BAD_NETPATH \ || (s) == APR_OS_START_SYSERR + ERROR_BAD_NET_NAME \ || (s) == APR_OS_START_SYSERR + ERROR_BAD_PATHNAME \ - || (s) == APR_OS_START_SYSERR + ERROR_INVALID_DRIVE) + || (s) == APR_OS_START_SYSERR + ERROR_INVALID_DRIVE \ + || (s) == APR_OS_START_SYSERR + ERROR_DIRECTORY) #define APR_STATUS_IS_ENOSPC(s) ((s) == APR_ENOSPC \ || (s) == APR_OS_START_SYSERR + ERROR_DISK_FULL) #define APR_STATUS_IS_ENOMEM(s) ((s) == APR_ENOMEM \
