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

fix build with bundled libgd

Browse source
This commit is contained in:
Remi Collet 2013-05-04 16:51:56 +02:00
parent 2a2ac5f2be
commit 00b097d2a3
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ext/gd/gd.c
View file

@ -29,14 +29,6 @@
#include "config.h"
#endif
#ifdef HAVE_GD_PNG
#include <png.h>
#endif
#ifdef HAVE_GD_JPG
# include <jpeglib.h>
#endif
#include "php.h"
#include "php_ini.h"
#include "ext/standard/head.h"
@ -61,6 +53,18 @@
# include <Wingdi.h>
#endif
#ifdef HAVE_GD_PNG
# include <png.h>
#endif
#ifdef HAVE_GD_JPG
# include <jpeglib.h>
#endif
#ifdef HAVE_GD_XPM
# include <X11/xpm.h>
#endif
#ifndef HAVE_GD_BUNDLED
#ifdef HAVE_GD_PNG
const char * gdPngGetVersionString()

2
ext/gd/php_gd.h
View file

@ -28,7 +28,7 @@
# endif
#endif
#if HAVE_LIBGD
#if defined(HAVE_LIBGD) || defined(HAVE_GD_BUNDLED)
/* open_basedir and safe_mode checks */
#define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg) \