Another possible error code clash, yay
authorMatthias Clasen <mclasen@redhat.com>
Fri, 10 Jul 2009 17:11:28 +0000 (13:11 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 10 Jul 2009 17:11:28 +0000 (13:11 -0400)
glib/gstrfuncs.c

index 3aed62c..85f653d 100644 (file)
@@ -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