Skip to content

Commit 038456b

Browse files
committed
Remove redundant <libintl.h> include
The HAVE_LIBINTL macro is defined only when the ext/gettext is enabled during the build. Also, LC_MESSAGES have been moved to other places since this header was initially included.
1 parent 565da77 commit 038456b

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

ext/standard/string.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
# include <langinfo.h>
2424
#endif
2525

26-
#ifdef HAVE_LIBINTL
27-
# include <libintl.h> /* For LC_MESSAGES */
28-
#endif
29-
3026
#include "scanf.h"
3127
#include "zend_API.h"
3228
#include "zend_execute.h"
@@ -5763,7 +5759,7 @@ PHP_FUNCTION(substr_count)
57635759

57645760
static void php_str_pad_fill(zend_string *result, size_t pad_chars, const char *pad_str, size_t pad_str_len) {
57655761
char *p = ZSTR_VAL(result) + ZSTR_LEN(result);
5766-
5762+
57675763
if (pad_str_len == 1) {
57685764
memset(p, pad_str[0], pad_chars);
57695765
ZSTR_LEN(result) += pad_chars;
@@ -5778,7 +5774,7 @@ static void php_str_pad_fill(zend_string *result, size_t pad_chars, const char *
57785774
if (p < end) {
57795775
memcpy(p, pad_str, end - p);
57805776
}
5781-
5777+
57825778
ZSTR_LEN(result) += pad_chars;
57835779
}
57845780

0 commit comments

Comments
 (0)