From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 10 Jul 2009 17:11:28 +0000 (-0400)
Subject: Another possible error code clash, yay
X-Git-Tag: 2.21.4~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=91925d2cf040730f89935a39c0d7aef3b4eb59dd;p=platform%2Fupstream%2Fglib.git

Another possible error code clash, yay
---

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 3aed62c..85f653d 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -1032,7 +1032,7 @@ g_strerror (gint errnum)
 #if defined(EDEADLK) && (!defined(EWOULDBLOCK) || (EDEADLK != EWOULDBLOCK))
     case EDEADLK: return "resource deadlock avoided";
 #endif
-#ifdef EDEADLOCK
+#if defined(EDEADLOCK) && (!defined(EDEADLK) || (EDEADLOCK != EDEADLK))
     case EDEADLOCK: return "resource deadlock avoided";
 #endif
 #ifdef EDESTADDRREQ