derick Tue Aug 9 04:47:58 2005 EDT
Modified files:
/php-src configure.in
/ZendEngine2 zend_extensions.h zend_modules.h
/php-src/main php.h php_version.h
Log:
- Changing the API numbers, which might be a bit premature, but it allows
to differentiate between different branches.
- Bumbed the version number to 6.0.0-dev. I know we didn't discuss this yet,
but I feel it should be 6.0. See mail to the mailinglist.
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579&r2=1.580&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579 php-src/configure.in:1.580
--- php-src/configure.in:1.579 Mon Aug 8 12:06:47 2005
+++ php-src/configure.in Tue Aug 9 04:47:52 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579 2005/08/08 16:06:47 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.580 2005/08/09 08:47:52 derick Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -39,8 +39,8 @@
AC_CONFIG_HEADER(main/php_config.h)
-MAJOR_VERSION=5
-MINOR_VERSION=1
+MAJOR_VERSION=6
+MINOR_VERSION=0
RELEASE_VERSION=0
EXTRA_VERSION="-dev"
VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
http://cvs.php.net/diff.php/ZendEngine2/zend_extensions.h?r1=1.67&r2=1.68&ty=u
Index: ZendEngine2/zend_extensions.h
diff -u ZendEngine2/zend_extensions.h:1.67 ZendEngine2/zend_extensions.h:1.68
--- ZendEngine2/zend_extensions.h:1.67 Wed Aug 3 09:30:52 2005
+++ ZendEngine2/zend_extensions.h Tue Aug 9 04:47:55 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_extensions.h,v 1.67 2005/08/03 13:30:52 sniper Exp $ */
+/* $Id: zend_extensions.h,v 1.68 2005/08/09 08:47:55 derick Exp $ */
#ifndef ZEND_EXTENSIONS_H
#define ZEND_EXTENSIONS_H
@@ -27,7 +27,7 @@
/* The first number is the engine version and the rest is the date.
* This way engine 2 API no. is always greater than engine 1 API no..
*/
-#define ZEND_EXTENSION_API_NO 220050617
+#define ZEND_EXTENSION_API_NO 220050809
typedef struct _zend_extension_version_info {
int zend_extension_api_no;
http://cvs.php.net/diff.php/ZendEngine2/zend_modules.h?r1=1.67&r2=1.68&ty=u
Index: ZendEngine2/zend_modules.h
diff -u ZendEngine2/zend_modules.h:1.67 ZendEngine2/zend_modules.h:1.68
--- ZendEngine2/zend_modules.h:1.67 Wed Aug 3 09:30:55 2005
+++ ZendEngine2/zend_modules.h Tue Aug 9 04:47:56 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_modules.h,v 1.67 2005/08/03 13:30:55 sniper Exp $ */
+/* $Id: zend_modules.h,v 1.68 2005/08/09 08:47:56 derick Exp $ */
#ifndef MODULES_H
#define MODULES_H
@@ -38,7 +38,7 @@
extern struct _zend_arg_info fourth_arg_force_ref[5];
extern struct _zend_arg_info all_args_by_ref[1];
-#define ZEND_MODULE_API_NO 20050617
+#define ZEND_MODULE_API_NO 20050809
#ifdef ZTS
#define USING_ZTS 1
#else
http://cvs.php.net/diff.php/php-src/main/php.h?r1=1.221&r2=1.222&ty=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.221 php-src/main/php.h:1.222
--- php-src/main/php.h:1.221 Sun Aug 7 11:13:50 2005
+++ php-src/main/php.h Tue Aug 9 04:47:57 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.221 2005/08/07 15:13:50 hholzgra Exp $ */
+/* $Id: php.h,v 1.222 2005/08/09 08:47:57 derick Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -26,7 +26,7 @@
#include <dmalloc.h>
#endif
-#define PHP_API_VERSION 20041225
+#define PHP_API_VERSION 20050809
#define PHP_HAVE_STREAMS
#define YYDEBUG 0
http://cvs.php.net/diff.php/php-src/main/php_version.h?r1=1.112&r2=1.113&ty=u
Index: php-src/main/php_version.h
diff -u php-src/main/php_version.h:1.112 php-src/main/php_version.h:1.113
--- php-src/main/php_version.h:1.112 Thu Jul 14 10:01:02 2005
+++ php-src/main/php_version.h Tue Aug 9 04:47:58 2005
@@ -1,7 +1,7 @@
/* automatically generated by configure */
/* edit configure.in to change version number */
-#define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 1
+#define PHP_MAJOR_VERSION 6
+#define PHP_MINOR_VERSION 0
#define PHP_RELEASE_VERSION 0
#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.1.0-dev"
+#define PHP_VERSION "6.0.0-dev"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
