summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorPierre Joye <pajoye@php.net>2011-07-22 11:25:30 +0000
committerPierre Joye <pajoye@php.net>2011-07-22 11:25:30 +0000
commitcc1c7af0375db5b7ad2c7752569b925cc3372377 (patch)
tree0bf43f30b0e5a4286a01da613bf901b92f9f9b3c /Zend
parent5ef9ab3b03867e8644b5140d618842199ef69202 (diff)
downloadphp-git-cc1c7af0375db5b7ad2c7752569b925cc3372377.tar.gz
- remove magic quotes support, functions are kept (see the NEWS entry for the details) for BC reasons but do not allow to set enable MQ
Diffstat (limited to 'Zend')
-rw-r--r--Zend/zend_float.c2
-rw-r--r--Zend/zend_ini_scanner.c2
-rw-r--r--Zend/zend_ini_scanner_defs.h2
-rw-r--r--Zend/zend_language_scanner.c2
-rw-r--r--Zend/zend_language_scanner_defs.h2
-rw-r--r--Zend/zend_operators.h1
6 files changed, 5 insertions, 6 deletions
diff --git a/Zend/zend_float.c b/Zend/zend_float.c
index db8d000dd4..9e9f7bb651 100644
--- a/Zend/zend_float.c
+++ b/Zend/zend_float.c
@@ -31,7 +31,7 @@ ZEND_API void zend_init_fpu(TSRMLS_D) /* {{{ */
EG(saved_fpu_cw_ptr) = (void*)&EG(saved_fpu_cw);
}
XPFPA_STORE_CW(EG(saved_fpu_cw_ptr));
- XPFPA_SWITCH_DOUBLE();
+// XPFPA_SWITCH_DOUBLE();
#else
EG(saved_fpu_cw_ptr) = NULL;
#endif
diff --git a/Zend/zend_ini_scanner.c b/Zend/zend_ini_scanner.c
index a7e71a5a5d..0b950c212e 100644
--- a/Zend/zend_ini_scanner.c
+++ b/Zend/zend_ini_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Aug 30 19:00:33 2010 */
+/* Generated by re2c 0.13.5 on Mon Jan 03 10:40:06 2011 */
#line 1 "Zend/zend_ini_scanner.l"
/*
+----------------------------------------------------------------------+
diff --git a/Zend/zend_ini_scanner_defs.h b/Zend/zend_ini_scanner_defs.h
index a3e7cbca70..1610e3a1f1 100644
--- a/Zend/zend_ini_scanner_defs.h
+++ b/Zend/zend_ini_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon Aug 30 19:00:34 2010 */
+/* Generated by re2c 0.13.5 on Mon Jan 03 10:40:06 2011 */
#line 3 "Zend/zend_ini_scanner_defs.h"
enum YYCONDTYPE {
diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 9097b5b8bb..bdbae58f7e 100644
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Jun 23 17:57:45 2011 */
+/* Generated by re2c 0.13.5 on Fri Jul 22 13:16:46 2011 */
#line 1 "Zend/zend_language_scanner.l"
/*
+----------------------------------------------------------------------+
diff --git a/Zend/zend_language_scanner_defs.h b/Zend/zend_language_scanner_defs.h
index 0c78414666..04997ff060 100644
--- a/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Thu Jun 23 17:57:45 2011 */
+/* Generated by re2c 0.13.5 on Fri Jul 22 13:16:46 2011 */
#line 3 "Zend/zend_language_scanner_defs.h"
enum YYCONDTYPE {
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index 8e3a37eee7..e599ca4971 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -474,7 +474,6 @@ static zend_always_inline int fast_increment_function(zval *op1)
"0:"
:
: "r"(op1));
-#else
if (UNEXPECTED(Z_LVAL_P(op1) == LONG_MAX)) {
/* switch to double */
Z_DVAL_P(op1) = (double)LONG_MAX + 1.0;