summaryrefslogtreecommitdiff
path: root/main/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'main/main.c')
-rw-r--r--main/main.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/main/main.c b/main/main.c
index ba1cef84c7..8131a891d5 100644
--- a/main/main.c
+++ b/main/main.c
@@ -90,10 +90,6 @@
#include "php_logos.h"
#include "php_streams.h"
-#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
-#include "ext/mbstring/mbstring.h"
-#endif /* defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING) */
-
#include "SAPI.h"
#include "rfc1867.h"
/* }}} */
@@ -1564,9 +1560,6 @@ PHPAPI int php_execute_script(zend_file_handle *primary_file TSRMLS_DC)
} else {
append_file_p = NULL;
}
-#if defined(ZEND_MULTIBYTE) && defined(HAVE_MBSTRING)
- php_mb_set_zend_encoding(TSRMLS_C);
-#endif /* ZEND_MULTIBYTE && HAVE_MBSTRING */
#ifdef PHP_WIN32
zend_unset_timeout(TSRMLS_C);
#endif