diff options
| author | Ondřej Surý <ondrej@sury.org> | 2013-05-09 17:32:08 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2013-05-09 17:32:08 +0200 |
| commit | d674441ee1b9e7407f464b2692d9f5a0e2be3b4e (patch) | |
| tree | cc4885524786f143bcc1af7d6c3f86fb571905de /main | |
| parent | 367111123281ebfd2876d4c8cf33414b394f489a (diff) | |
| download | php-d674441ee1b9e7407f464b2692d9f5a0e2be3b4e.tar.gz | |
Imported Upstream version 5.5.0~rc1upstream/5.5.0_rc1
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_config.h.in | 74 | ||||
| -rw-r--r-- | main/php_version.h | 4 |
2 files changed, 3 insertions, 75 deletions
diff --git a/main/php_config.h.in b/main/php_config.h.in index a20b2b391..8abbabf88 100644 --- a/main/php_config.h.in +++ b/main/php_config.h.in @@ -25,9 +25,6 @@ #undef BETHREADS /* */ -#undef BUGGY_SNMPRINT_VALUE - -/* */ #undef CDB_INCLUDE_FILE /* Define if system uses EBCDIC */ @@ -517,9 +514,6 @@ /* */ #undef HAVE_CODBC -/* */ -#undef HAVE_COLORCLOSESTHWB - /* Whether you have a Continuity Server */ #undef HAVE_CONTINUITY @@ -714,52 +708,13 @@ #undef HAVE_GCVT /* */ -#undef HAVE_GDIMAGECOLORRESOLVE - -/* */ #undef HAVE_GD_BUNDLED /* */ #undef HAVE_GD_CACHE_CREATE /* */ -#undef HAVE_GD_DYNAMIC_CTX_EX - -/* */ -#undef HAVE_GD_FONTCACHESHUTDOWN - -/* */ -#undef HAVE_GD_FONTMUTEX - -/* */ -#undef HAVE_GD_FREEFONTCACHE - -/* */ -#undef HAVE_GD_GD2 - -/* */ -#undef HAVE_GD_GIF_CREATE - -/* */ -#undef HAVE_GD_GIF_CTX - -/* */ -#undef HAVE_GD_GIF_READ - -/* */ -#undef HAVE_GD_IMAGEELLIPSE - -/* */ -#undef HAVE_GD_IMAGESETBRUSH - -/* */ -#undef HAVE_GD_IMAGESETTILE - -/* */ -#undef HAVE_GD_IMAGE_CONVOLUTION - -/* */ -#undef HAVE_GD_IMAGE_PIXELATE +#undef HAVE_GD_FREETYPE /* */ #undef HAVE_GD_JPG @@ -768,24 +723,9 @@ #undef HAVE_GD_PNG /* */ -#undef HAVE_GD_STRINGFT - -/* */ -#undef HAVE_GD_STRINGFTEX - -/* */ -#undef HAVE_GD_STRINGTTF - -/* */ -#undef HAVE_GD_WBMP - -/* */ #undef HAVE_GD_WEBP /* */ -#undef HAVE_GD_XBM - -/* */ #undef HAVE_GD_XPM /* Define if you have the getaddrinfo function */ @@ -1056,18 +996,6 @@ #undef HAVE_LIBGD /* */ -#undef HAVE_LIBGD13 - -/* */ -#undef HAVE_LIBGD15 - -/* */ -#undef HAVE_LIBGD20 - -/* */ -#undef HAVE_LIBGD204 - -/* */ #undef HAVE_LIBICONV /* */ diff --git a/main/php_version.h b/main/php_version.h index 944a8998c..510ba3dc1 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 "beta4" -#define PHP_VERSION "5.5.0beta4" +#define PHP_EXTRA_VERSION "RC1" +#define PHP_VERSION "5.5.0RC1" #define PHP_VERSION_ID 50500 |