apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r885699 - in /apr/apr/branches/1.4.x: ./ CHANGES include/apr_errno.h
Date Tue, 01 Dec 2009 09:29:45 GMT
Author: brane
Date: Tue Dec  1 09:29:45 2009
New Revision: 885699

URL: http://svn.apache.org/viewvc?rev=885699&view=rev
Log:
Merge r821306 from trunk:
On Windows, map the system error code ERROR DIRECTORY which means
"directory name is not valid" into APR_STATUS_IS_ENOTDIR.

Modified:
    apr/apr/branches/1.4.x/   (props changed)
    apr/apr/branches/1.4.x/CHANGES
    apr/apr/branches/1.4.x/include/apr_errno.h

Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec  1 09:29:45 2009
@@ -1 +1 @@
-/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,829490,831641
+/apr/apr/trunk:733052,747990,748361,748371,748565,748888,748988,749810,782838,783398,783958,784633,784773,788588,793192,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641

Modified: apr/apr/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/CHANGES?rev=885699&r1=885698&r2=885699&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr/branches/1.4.x/CHANGES [utf-8] Tue Dec  1 09:29:45 2009
@@ -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

Modified: apr/apr/branches/1.4.x/include/apr_errno.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_errno.h?rev=885699&r1=885698&r2=885699&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_errno.h (original)
+++ apr/apr/branches/1.4.x/include/apr_errno.h Tue Dec  1 09:29:45 2009
@@ -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 \



Mime
View raw message