diff options
Diffstat (limited to 'win32/build')
| -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 |
7 files changed, 20 insertions, 6 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 |
+----------------------------------------------------------------------+
|