rasmus Wed, 02 Jun 2010 05:53:13 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=300085
Log: 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. Bug: http://bugs.php.net/51847 (Open) php 5.2.13 and gettext 0.18: Undefined symbols: _zif_setlocale Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/string.c U php/php-src/branches/PHP_5_3/ext/standard/string.c U php/php-src/trunk/ext/standard/string.c Modified: php/php-src/branches/PHP_5_2/ext/standard/string.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/standard/string.c 2010-06-02 03:51:46 UTC (rev 300084) +++ php/php-src/branches/PHP_5_2/ext/standard/string.c 2010-06-02 05:53:13 UTC (rev 300085) @@ -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> Modified: php/php-src/branches/PHP_5_3/ext/standard/string.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/standard/string.c 2010-06-02 03:51:46 UTC (rev 300084) +++ php/php-src/branches/PHP_5_3/ext/standard/string.c 2010-06-02 05:53:13 UTC (rev 300085) @@ -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" Modified: php/php-src/trunk/ext/standard/string.c =================================================================== --- php/php-src/trunk/ext/standard/string.c 2010-06-02 03:51:46 UTC (rev 300084) +++ php/php-src/trunk/ext/standard/string.c 2010-06-02 05:53:13 UTC (rev 300085) @@ -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"
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
