diff options
| author | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
|---|---|---|
| committer | Florian MARGAINE <florian@margaine.com> | 2014-09-20 10:09:21 +0200 |
| commit | 8eb7e7bf7f63f49e97f112871df47c6d6213e715 (patch) | |
| tree | 24b9059118cf6abb5fe0837eaa477b4668b18435 /win32 | |
| parent | 58ed832fc99d5c5aeac7849819bbc4e0dc90d698 (diff) | |
| parent | 95836a350420cabc2e8e5f5c45131fba46504a3b (diff) | |
| download | php-git-8eb7e7bf7f63f49e97f112871df47c6d6213e715.tar.gz | |
Merge branch 'master' into issue-67910
Conflicts:
README.PARAMETER_PARSING_API
ext/gmp/tests/001.phpt
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/Makefile | 2 | ||||
| -rw-r--r-- | win32/build/buildconf.js | 2 | ||||
| -rw-r--r-- | win32/build/config.w32 | 3 | ||||
| -rw-r--r-- | win32/build/config.w32.h.in | 5 | ||||
| -rw-r--r-- | win32/build/confutils.js | 10 | ||||
| -rw-r--r-- | win32/build/deplister.c | 2 | ||||
| -rw-r--r-- | win32/build/phpize.js.in | 2 | ||||
| -rw-r--r-- | win32/globals.c | 2 | ||||
| -rw-r--r-- | win32/grp.h | 2 | ||||
| -rw-r--r-- | win32/php_win32_globals.h | 2 | ||||
| -rw-r--r-- | win32/registry.c | 2 | ||||
| -rw-r--r-- | win32/select.c | 2 | ||||
| -rw-r--r-- | win32/select.h | 2 | ||||
| -rw-r--r-- | win32/sockets.c | 2 | ||||
| -rw-r--r-- | win32/sockets.h | 2 | ||||
| -rw-r--r-- | win32/syslog.h | 2 | ||||
| -rw-r--r-- | win32/winutil.c | 2 | ||||
| -rw-r--r-- | win32/winutil.h | 2 |
18 files changed, 31 insertions, 17 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index fc1127cbcf..b2918b7117 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -1,5 +1,5 @@ # +----------------------------------------------------------------------+ -# | PHP Version 5 | +# | PHP Version 7 | # +----------------------------------------------------------------------+ # | Copyright (c) 1997-2008 The PHP Group | # +----------------------------------------------------------------------+ diff --git a/win32/build/buildconf.js b/win32/build/buildconf.js index b4194ad203..2fa134a3b4 100644 --- a/win32/build/buildconf.js +++ b/win32/build/buildconf.js @@ -1,6 +1,6 @@ /*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2008 The PHP Group |
+----------------------------------------------------------------------+
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 1d2949c5ae..82378b536d 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -362,7 +362,8 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \ zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \ zend_object_handlers.c zend_objects_API.c \ zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \ - zend_float.c zend_string.c zend_generators.c zend_virtual_cwd.c zend_ast.c"); + zend_float.c zend_string.c zend_generators.c zend_virtual_cwd.c zend_ast.c \ + zend_inheritance.c"); if (VCVERS == 1200) { AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1); diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 9efdfdea3e..e74108ce96 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -174,3 +174,8 @@ # define _USE_32BIT_TIME_T 1 #endif #define HAVE_STDLIB_H 1 + +#define _REENTRANT 1 +#define HAVE_MBRLEN 1 +#define HAVE_MBSTATE_T 1 + diff --git a/win32/build/confutils.js b/win32/build/confutils.js index d8155bbaa8..4b6abe1615 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1,7 +1,7 @@ // Utils for configure script
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2008 The PHP Group |
+----------------------------------------------------------------------+
@@ -1887,6 +1887,14 @@ function generate_config_h() outfile.WriteLine("#define " + keys[i] + " " + pieces);
}
+
+ if (VCVERS >= 1800) {
+ outfile.WriteLine("");
+ outfile.WriteLine("#define HAVE_ACOSH 1");
+ outfile.WriteLine("#define HAVE_ASINH 1");
+ outfile.WriteLine("#define HAVE_ATANH 1");
+ }
+
outfile.Close();
}
diff --git a/win32/build/deplister.c b/win32/build/deplister.c index 31f1f07e67..bae6d031f6 100644 --- a/win32/build/deplister.c +++ b/win32/build/deplister.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index c99dece618..a843cb91a4 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -1,6 +1,6 @@ /*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2008 The PHP Group |
+----------------------------------------------------------------------+
diff --git a/win32/globals.c b/win32/globals.c index 0f88e4cc63..ec4180db38 100644 --- a/win32/globals.c +++ b/win32/globals.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/win32/grp.h b/win32/grp.h index 899d3ac0cd..71454fc3b6 100644 --- a/win32/grp.h +++ b/win32/grp.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/win32/php_win32_globals.h b/win32/php_win32_globals.h index 6bf9ba5b71..42f5ec9411 100644 --- a/win32/php_win32_globals.h +++ b/win32/php_win32_globals.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/win32/registry.c b/win32/registry.c index 8ed838b1d1..10372cd624 100644 --- a/win32/registry.c +++ b/win32/registry.c @@ -244,7 +244,7 @@ void UpdateIniFromRegistry(char *path TSRMLS_DC) zval *data; ZEND_HASH_FOREACH_KEY_VAL(ht, num, index, data) { - zend_alter_ini_entry(index, Z_STRVAL_P(data), Z_STRLEN_P(data), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); + zend_alter_ini_entry(index, Z_STR_P(data), PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE); } ZEND_HASH_FOREACH_END(); /* for (zend_hash_internal_pointer_reset_ex(ht, &pos); diff --git a/win32/select.c b/win32/select.c index 8e44636945..636c84364a 100644 --- a/win32/select.c +++ b/win32/select.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/win32/select.h b/win32/select.h index a8d8496295..dafe76c1bc 100644 --- a/win32/select.h +++ b/win32/select.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/win32/sockets.c b/win32/sockets.c index 8b3898bb3c..1fceabb90a 100644 --- a/win32/sockets.c +++ b/win32/sockets.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/win32/sockets.h b/win32/sockets.h index 78a0d3a967..c5cd4d19ed 100644 --- a/win32/sockets.h +++ b/win32/sockets.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/win32/syslog.h b/win32/syslog.h index 06397d0f90..5274f64c44 100644 --- a/win32/syslog.h +++ b/win32/syslog.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/win32/winutil.c b/win32/winutil.c index 9984d3addc..5203fb4e66 100644 --- a/win32/winutil.c +++ b/win32/winutil.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ diff --git a/win32/winutil.h b/win32/winutil.h index e0193d33f3..74d72062c4 100644 --- a/win32/winutil.h +++ b/win32/winutil.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ |