diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-04-25 12:53:02 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-04-25 12:53:02 +0200 |
| commit | 367111123281ebfd2876d4c8cf33414b394f489a (patch) | |
| tree | 9e9d69d988b632304f51746d89c1eb3e0a178257 /main | |
| parent | 5a7c0b1f326279a6d7dba8285e81860e1f0ff8ce (diff) | |
| download | php-367111123281ebfd2876d4c8cf33414b394f489a.tar.gz | |
Imported Upstream version 5.5.0~beta4upstream/5.5.0_beta4
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_config.h.in | 9 | ||||
| -rw-r--r-- | main/php_version.h | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/main/php_config.h.in b/main/php_config.h.in index 6e76a4abf..a20b2b391 100644 --- a/main/php_config.h.in +++ b/main/php_config.h.in @@ -756,6 +756,12 @@ #undef HAVE_GD_IMAGESETTILE /* */ +#undef HAVE_GD_IMAGE_CONVOLUTION + +/* */ +#undef HAVE_GD_IMAGE_PIXELATE + +/* */ #undef HAVE_GD_JPG /* */ @@ -2171,9 +2177,6 @@ /* Define if your system has fork/vfork/CreateProcess */ #undef PHP_CAN_SUPPORT_PROC_OPEN -/* */ -#undef PHP_CURL_URL_WRAPPERS - /* Whether the system supports extended DES salt */ #undef PHP_EXT_DES_CRYPT diff --git a/main/php_version.h b/main/php_version.h index 395e47047..944a8998c 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -3,6 +3,6 @@ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 5 #define PHP_RELEASE_VERSION 0 -#define PHP_EXTRA_VERSION "beta3" -#define PHP_VERSION "5.5.0beta3" +#define PHP_EXTRA_VERSION "beta4" +#define PHP_VERSION "5.5.0beta4" #define PHP_VERSION_ID 50500 |