From: Rasmus Lerdorf <rasmus@php.net>
Date: Wed, 2 Jun 2010 05:53:13 +0000 (+0000)
Subject: Fix for bug #51847
X-Git-Tag: php-5.2.14RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83e13b2f2b2b0c0c336298f402c28fe6bd7aeca8;p=php

Fix for bug #51847
Someone in libintl world decided it was a good idea to do:

#undef setlocale
#define setlocale libintl_setlocale

That means, of course, that any use of "setlocale" by the
preprocessor now becomes libintl_setlocale which means we
no longer have a _zif_setlocale symbol in string.o, but we
magically have a _zif_libintl_setlocale symbol.  The linker
is obviously not very happy about this when basic_functions.o
tries to find _zif_setlocale.

So, let's not do that again.
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 694c0a5fb0..dd8936d31f 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -39,6 +39,9 @@
 #endif
 #ifdef HAVE_LIBINTL
 # include <libintl.h> /* For LC_MESSAGES */
+ #ifdef setlocale
+ # undef setlocale /* Uh, libintl, don't F* our symbols please */
+ #endif
 #endif
 
 #include <math.h>