diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-06-28 20:14:29 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-06-28 20:14:29 +0200 |
| commit | 1f9906ab5bff108897c21a3e86f2434a8d4e2c4c (patch) | |
| tree | 1db768aea5721a677916fb13d1dc9e40a5af9f83 | |
| parent | 796dc564e2aac61b1584ecbb9e8ab3641c26de42 (diff) | |
| parent | df4bb13c55b39babfafdaf992f5653148e97c84f (diff) | |
| download | php-git-1f9906ab5bff108897c21a3e86f2434a8d4e2c4c.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Update changelogs [ci skip]
Remove HAVE_ERRNO_H from libgd
| -rw-r--r-- | ext/gd/libgd/gdkanji.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ext/gd/libgd/gdkanji.c b/ext/gd/libgd/gdkanji.c index 3158e077c3..8389ec7081 100644 --- a/ext/gd/libgd/gdkanji.c +++ b/ext/gd/libgd/gdkanji.c @@ -11,10 +11,8 @@ #include <stdarg.h> #if defined(HAVE_ICONV_H) || defined(HAVE_ICONV) #include <iconv.h> -#ifdef HAVE_ERRNO_H #include <errno.h> #endif -#endif #if defined(HAVE_ICONV_H) && !defined(HAVE_ICONV) #define HAVE_ICONV 1 @@ -349,11 +347,9 @@ do_convert (unsigned char *to, unsigned char *from, const char *code) if ((cd = iconv_open (EUCSTR, code)) == (iconv_t) - 1) { error ("iconv_open() error"); -#ifdef HAVE_ERRNO_H if (errno == EINVAL) error ("invalid code specification: \"%s\" or \"%s\"", EUCSTR, code); -#endif strcpy ((char *) to, (const char *) from); return; } @@ -363,7 +359,6 @@ do_convert (unsigned char *to, unsigned char *from, const char *code) if ((int) iconv(cd, (char **) &from, &from_len, (char **) &to, &to_len) == -1) { -#ifdef HAVE_ERRNO_H if (errno == EINVAL) error ("invalid end of input string"); else if (errno == EILSEQ) @@ -371,7 +366,6 @@ do_convert (unsigned char *to, unsigned char *from, const char *code) else if (errno == E2BIG) error ("output buffer overflow at do_convert()"); else -#endif error ("something happen"); strcpy ((char *) to, (const char *) from); return; |