diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2010-06-02 05:53:13 +0000 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2010-06-02 05:53:13 +0000 |
| commit | 3f602cf51090c7e8ae33a6f226854d8bb50ca110 (patch) | |
| tree | 6015fcd9e8c6a2662a7817ba9da6cec6912db270 | |
| parent | 19ff5b79162aaab14a423437bda2c7c8d307cdbd (diff) | |
| download | php-git-3f602cf51090c7e8ae33a6f226854d8bb50ca110.tar.gz | |
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.
| -rw-r--r-- | ext/standard/string.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 8c483d5870..e342b56527 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -38,6 +38,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 "scanf.h" |