File tree Expand file tree Collapse file tree 1 file changed +3
-14
lines changed Expand file tree Collapse file tree 1 file changed +3
-14
lines changed Original file line number Diff line number Diff line change 26
26
# include <langinfo.h>
27
27
#endif
28
28
29
- /*
30
- * This define is here because some versions of libintl redefine setlocale
31
- * to point to libintl_setlocale. That's a ridiculous thing to do as far
32
- * as I am concerned, but with this define and the subsequent undef we
33
- * limit the damage to just the actual setlocale() call in this file
34
- * without turning zif_setlocale into zif_libintl_setlocale. -Rasmus
35
- */
36
- #define php_my_setlocale setlocale
37
29
#ifdef HAVE_LIBINTL
38
30
# include <libintl.h> /* For LC_MESSAGES */
39
- #ifdef setlocale
40
- # undef setlocale
41
- #endif
42
31
#endif
43
32
44
33
#include "scanf.h"
@@ -4661,7 +4650,7 @@ PHP_FUNCTION(setlocale)
4661
4650
}
4662
4651
4663
4652
# ifndef PHP_WIN32
4664
- retval = php_my_setlocale (cat , loc ? ZSTR_VAL (loc ) : NULL );
4653
+ retval = setlocale (cat , loc ? ZSTR_VAL (loc ) : NULL );
4665
4654
# else
4666
4655
if (loc ) {
4667
4656
/* BC: don't try /^[a-z]{2}_[A-Z]{2}($|\..*)/ except for /^u[ks]_U[KS]$/ */
@@ -4676,10 +4665,10 @@ PHP_FUNCTION(setlocale)
4676
4665
) {
4677
4666
retval = NULL ;
4678
4667
} else {
4679
- retval = php_my_setlocale (cat , ZSTR_VAL (loc ));
4668
+ retval = setlocale (cat , ZSTR_VAL (loc ));
4680
4669
}
4681
4670
} else {
4682
- retval = php_my_setlocale (cat , NULL );
4671
+ retval = setlocale (cat , NULL );
4683
4672
}
4684
4673
# endif
4685
4674
zend_update_current_locale ();
You can’t perform that action at this time.
0 commit comments