glib r7859 - trunk/gio

[matthiasc svn gnome org]

Author: matthiasc
Date: Thu Feb 12 01:52:17 2009
New Revision: 7859
URL: http://svn.gnome.org/viewvc/glib?rev=7859&view=rev

Log:
        * gioerror.c (g_io_error_from_errno): Cope with EEXIST == ENOTEMPTY.
        Reported by Nicolas Joseph



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gioerror.c

Modified: trunk/gio/gioerror.c
==============================================================================
--- trunk/gio/gioerror.c	(original)
+++ trunk/gio/gioerror.c	Thu Feb 12 01:52:17 2009
@@ -138,7 +138,7 @@
       break;
 #endif
 
-#ifdef ENOTEMPTY
+#if defined(ENOTEMPTY) && (!defined (EEXIST) || (ENOTEMPTY != EEXIST))
     case ENOTEMPTY:
       return G_IO_ERROR_NOT_EMPTY;
       break;