From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Thu, 12 Feb 2009 01:52:17 +0000 (+0000)
Subject: Cope with EEXIST == ENOTEMPTY. Reported by Nicolas Joseph
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=bbf0530f24abb697bf3d01e22331b1227b4b9f52;p=dana%2Fcg-glib.git

Cope with EEXIST == ENOTEMPTY. Reported by Nicolas Joseph

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


svn path=/trunk/; revision=7859
---

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 8112ce2b..fb38aff4 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 541225 – Can't compile gio on AIX : duplicate case value in 
+	gioerror.c
+
+	* gioerror.c (g_io_error_from_errno): Cope with EEXIST == ENOTEMPTY. 
+	Reported by Nicolas Joseph 
+
 2009-02-04  Alexander Larsson  <alexl@redhat.com>
 
 	Bug 566747 - URIs opened with firefox %u load as local files
diff --git a/gio/gioerror.c b/gio/gioerror.c
index 0419a7d0..697070bb 100644
--- a/gio/gioerror.c
+++ b/gio/gioerror.c
@@ -138,7 +138,7 @@ g_io_error_from_errno (gint err_no)
       break;
 #endif
 
-#ifdef ENOTEMPTY
+#if defined(ENOTEMPTY) && (!defined (EEXIST) || (ENOTEMPTY != EEXIST))
     case ENOTEMPTY:
       return G_IO_ERROR_NOT_EMPTY;
       break;