From 91925d2cf040730f89935a39c0d7aef3b4eb59dd Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 10 Jul 2009 13:11:28 -0400 Subject: [PATCH] Another possible error code clash, yay --- glib/gstrfuncs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.7.4