diff options
| author | Anatol Belski <ab@php.net> | 2014-10-06 18:36:26 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-06 18:36:26 +0200 |
| commit | bd9f17846df5ca7c7f606e4392f02861523b7cd5 (patch) | |
| tree | 280d445b62fb1a0d5655facdeb554184e665d3fc /main/php_version.h | |
| parent | 60f0695a0982c556c826191d28c8ba3a72fd2a2b (diff) | |
| parent | 5d7ccb758b407d1ba6bc7502b22ebb7cfcd2912c (diff) | |
| download | php-git-bd9f17846df5ca7c7f606e4392f02861523b7cd5.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
bring back the correct php_version.h
fix the empty_strings SAPI shutdown leak in TS build
Use fastcall calling convention for heap functions
fix leaking the empty_string in TS builds
remove successive assignment
Diffstat (limited to 'main/php_version.h')
| -rw-r--r-- | main/php_version.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/php_version.h b/main/php_version.h index 87c2e4ac4d..d48ab24141 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -1,8 +1,8 @@ /* automatically generated by configure */ /* edit configure.in to change version number */ -#define PHP_MAJOR_VERSION 5 -#define PHP_MINOR_VERSION 7 +#define PHP_MAJOR_VERSION 7 +#define PHP_MINOR_VERSION 0 #define PHP_RELEASE_VERSION 0 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "5.7.0-dev" -#define PHP_VERSION_ID 50700 +#define PHP_VERSION "7.0.0-dev" +#define PHP_VERSION_ID 70000 |