summaryrefslogtreecommitdiff
path: root/glib/gstrfuncs.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2009-07-10 13:11:28 -0400
committerMatthias Clasen <mclasen@redhat.com>2009-07-10 13:11:28 -0400
commit91925d2cf040730f89935a39c0d7aef3b4eb59dd (patch)
treedb58db4772e613bf8e97b1e2444235af2e3fcb05 /glib/gstrfuncs.c
parentc23536cefeacc72d03ad8a83f315758d751cb127 (diff)
downloadglib-91925d2cf040730f89935a39c0d7aef3b4eb59dd.tar.gz
Another possible error code clash, yay
Diffstat (limited to 'glib/gstrfuncs.c')
-rw-r--r--glib/gstrfuncs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 3aed62c9c..85f653d1b 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