[glib/glib-2-20] Another possible error code clash, yay

[Matthias Clasen <matthiasc src gnome org>]

commit 9939347cceb0c839b3a962f75614af0a3d0e4303
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jul 10 13:11:28 2009 -0400

    Another possible error code clash, yay

 glib/gstrfuncs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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