Merge branch 'PHP-5.5'

* PHP-5.5:
  Bump API versions
This commit is contained in:
David Soria Parra 2012-11-13 20:58:51 +01:00
commit 2e6a4a286e
3 changed files with 3 additions and 3 deletions

View File

@ -28,7 +28,7 @@
/* The first number is the engine version and the rest is the date.
* This way engine 2/3 API no. is always greater than engine 1 API no..
*/
#define ZEND_EXTENSION_API_NO 220100525
#define ZEND_EXTENSION_API_NO 220121113
typedef struct _zend_extension_version_info {
int zend_extension_api_no;

View File

@ -33,7 +33,7 @@
#define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC
#define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC
#define ZEND_MODULE_API_NO 20100525
#define ZEND_MODULE_API_NO 20121113
#ifdef ZTS
#define USING_ZTS 1
#else

View File

@ -26,7 +26,7 @@
#include <dmalloc.h>
#endif
#define PHP_API_VERSION 20100412
#define PHP_API_VERSION 20121113
#define PHP_HAVE_STREAMS
#define YYDEBUG 0