archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove HAVE_ERRNO_H from libgd

Browse source 
The check for errno.h has been removed via
50b9ef8d94

Upstream libgd library is also patched via
1e7f93922f
This commit is contained in:
Peter Kokot 2019-06-28 00:58:26 +02:00
parent 45ab57339e
commit a014e50513
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/gd/libgd/gdkanji.c
View file

@ -11,10 +11,8 @@
#include <stdarg.h> #include <stdarg.h>
#if defined(HAVE_ICONV_H) || defined(HAVE_ICONV) #if defined(HAVE_ICONV_H) || defined(HAVE_ICONV)
#include <iconv.h> #include <iconv.h>
#ifdef HAVE_ERRNO_H
#include <errno.h> #include <errno.h>
#endif #endif
#endif
#if defined(HAVE_ICONV_H) && !defined(HAVE_ICONV) #if defined(HAVE_ICONV_H) && !defined(HAVE_ICONV)
#define HAVE_ICONV 1 #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) if ((cd = iconv_open (EUCSTR, code)) == (iconv_t) - 1)
{ {
error ("iconv_open() error"); error ("iconv_open() error");
#ifdef HAVE_ERRNO_H
if (errno == EINVAL) if (errno == EINVAL)
error ("invalid code specification: \"%s\" or \"%s\"", error ("invalid code specification: \"%s\" or \"%s\"",
EUCSTR, code); EUCSTR, code);
#endif
strcpy ((char *) to, (const char *) from); strcpy ((char *) to, (const char *) from);
return; 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) if ((int) iconv(cd, (char **) &from, &from_len, (char **) &to, &to_len) == -1)
{ {
#ifdef HAVE_ERRNO_H
if (errno == EINVAL) if (errno == EINVAL)
error ("invalid end of input string"); error ("invalid end of input string");
else if (errno == EILSEQ) else if (errno == EILSEQ)
@ -371,7 +366,6 @@ do_convert (unsigned char *to, unsigned char *from, const char *code)
else if (errno == E2BIG) else if (errno == E2BIG)
error ("output buffer overflow at do_convert()"); error ("output buffer overflow at do_convert()");
else else
#endif
error ("something happen"); error ("something happen");
strcpy ((char *) to, (const char *) from); strcpy ((char *) to, (const char *) from);
return; return;