mirror of
https://github.com/php/php-src.git
synced 2024-09-21 01:47:25 +00:00
Clean-up unused headers (#14365)
* ext/mbstring.c: clean-up headers and include intrinsics
This commit is contained in:
parent
c3b3e90cea
commit
25a5146180
@ -26,7 +26,6 @@
|
||||
|
||||
/* PHP Includes */
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "main/php_network.h"
|
||||
|
||||
/* for fileno() */
|
||||
|
@ -32,8 +32,7 @@
|
||||
|
||||
#include "php_dba.h"
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/standard/flock_compat.h"
|
||||
#include "ext/standard/flock_compat.h" /* Compatibility for Windows */
|
||||
|
||||
#include "php_gdbm.h"
|
||||
#include "php_ndbm.h"
|
||||
|
@ -17,10 +17,7 @@
|
||||
#ifndef PHP_LIBMAGIC_H
|
||||
#define PHP_LIBMAGIC_H
|
||||
|
||||
#include "php_fileinfo.h"
|
||||
|
||||
#include "main/php_network.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/pcre/php_pcre.h"
|
||||
|
||||
#ifdef PHP_WIN32
|
||||
|
@ -22,6 +22,8 @@
|
||||
#endif
|
||||
|
||||
#include "php_filter.h"
|
||||
#include "main/php_variables.h"
|
||||
#include "ext/standard/info.h"
|
||||
|
||||
ZEND_DECLARE_MODULE_GLOBALS(filter)
|
||||
|
||||
|
@ -22,10 +22,6 @@
|
||||
#include "zend_API.h"
|
||||
#include "php.h"
|
||||
#include "php_ini.h"
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/standard/html.h"
|
||||
#include "php_variables.h"
|
||||
|
||||
extern zend_module_entry filter_module_entry;
|
||||
#define phpext_filter_ptr &filter_module_entry
|
||||
|
@ -16,6 +16,8 @@
|
||||
|
||||
#include "php_filter.h"
|
||||
#include "filter_private.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/standard/html.h"
|
||||
#include "zend_smart_str.h"
|
||||
|
||||
/* {{{ STRUCTS */
|
||||
|
@ -23,7 +23,6 @@
|
||||
#include "SAPI.h"
|
||||
|
||||
#include "zend_variables.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/file.h"
|
||||
|
||||
|
@ -21,15 +21,9 @@
|
||||
#include "php_variables.h"
|
||||
#include "libmbfl/mbfl/mbfilter_pass.h"
|
||||
#include "mbstring.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/standard/php_mail.h"
|
||||
#include "ext/standard/url.h"
|
||||
#include "main/php_output.h"
|
||||
#include "ext/standard/info.h"
|
||||
|
||||
#include "php_globals.h"
|
||||
#include "rfc1867.h"
|
||||
#include "php_content_types.h"
|
||||
#include "SAPI.h"
|
||||
#include "TSRM.h"
|
||||
|
||||
|
@ -28,14 +28,12 @@
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/standard/php_mail.h"
|
||||
#include "ext/standard/exec.h"
|
||||
#include "ext/standard/url.h"
|
||||
#include "main/php_output.h"
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/pcre/php_pcre.h"
|
||||
|
||||
#include "libmbfl/mbfl/mbfilter_8bit.h"
|
||||
#include "libmbfl/mbfl/mbfilter_pass.h"
|
||||
#include "libmbfl/mbfl/mbfilter_wchar.h"
|
||||
#include "libmbfl/mbfl/eaw_table.h"
|
||||
#include "libmbfl/filters/mbfilter_base64.h"
|
||||
#include "libmbfl/filters/mbfilter_cjk.h"
|
||||
@ -43,13 +41,11 @@
|
||||
#include "libmbfl/filters/mbfilter_htmlent.h"
|
||||
#include "libmbfl/filters/mbfilter_uuencode.h"
|
||||
#include "libmbfl/filters/mbfilter_ucs4.h"
|
||||
#include "libmbfl/filters/mbfilter_utf8.h"
|
||||
#include "libmbfl/filters/mbfilter_utf16.h"
|
||||
#include "libmbfl/filters/mbfilter_singlebyte.h"
|
||||
#include "libmbfl/filters/translit_kana_jisx0201_jisx0208.h"
|
||||
#include "libmbfl/filters/unicode_prop.h"
|
||||
|
||||
#include "php_variables.h"
|
||||
#include "php_globals.h"
|
||||
#include "rfc1867.h"
|
||||
#include "php_content_types.h"
|
||||
@ -69,6 +65,15 @@
|
||||
|
||||
#include "rare_cp_bitvec.h"
|
||||
|
||||
#ifdef __SSE2__
|
||||
#include <emmintrin.h>
|
||||
#endif
|
||||
|
||||
#ifdef __SSE3__
|
||||
#include <immintrin.h>
|
||||
#include <pmmintrin.h>
|
||||
#endif
|
||||
|
||||
/* }}} */
|
||||
|
||||
/* {{{ prototypes */
|
||||
|
@ -25,7 +25,6 @@
|
||||
#include "php.h"
|
||||
#include "php_ini.h"
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "php_mysqli.h"
|
||||
#include "php_mysqli_structs.h"
|
||||
#include "mysqli_priv.h"
|
||||
|
@ -27,14 +27,12 @@
|
||||
#include "zend_attributes.h"
|
||||
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/standard/php_standard.h"
|
||||
#include "Zend/zend_interfaces.h"
|
||||
#include "zend_smart_str.h"
|
||||
|
||||
#include "php_odbc.h"
|
||||
#include "php_odbc_includes.h"
|
||||
#include "php_globals.h"
|
||||
|
||||
/* actually lives in main/ */
|
||||
#include "php_odbc_utils.h"
|
||||
@ -42,7 +40,6 @@
|
||||
#ifdef HAVE_UODBC
|
||||
|
||||
#include <fcntl.h>
|
||||
#include "ext/standard/head.h"
|
||||
#include "php_ini.h"
|
||||
|
||||
#define PHP_ODBC_BINMODE_PASSTHRU 0
|
||||
|
@ -16,15 +16,12 @@
|
||||
|
||||
#include "php.h"
|
||||
#include "php_ini.h"
|
||||
#include "php_globals.h"
|
||||
#include "php_pcre.h"
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/basic_functions.h"
|
||||
#include "zend_smart_str.h"
|
||||
#include "SAPI.h"
|
||||
|
||||
#include "ext/standard/php_string.h"
|
||||
|
||||
#define PREG_PATTERN_ORDER 1
|
||||
#define PREG_SET_ORDER 2
|
||||
#define PREG_OFFSET_CAPTURE (1<<8)
|
||||
|
@ -22,8 +22,7 @@
|
||||
|
||||
#include "php.h"
|
||||
#include "php_ini.h"
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/standard/php_string.h" /* For php_addcslashes_str() in _pdo_pgsql_escape_credentials() */
|
||||
#include "main/php_network.h"
|
||||
#include "pdo/php_pdo.h"
|
||||
#include "pdo/php_pdo_driver.h"
|
||||
|
@ -21,7 +21,6 @@
|
||||
#include "php.h"
|
||||
#include <unistd.h>
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "php_posix.h"
|
||||
|
||||
#ifdef HAVE_POSIX
|
||||
|
@ -25,14 +25,12 @@
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include <time.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#ifdef PHP_WIN32
|
||||
#include "win32/unistd.h"
|
||||
#endif
|
||||
#include "zend_globals.h"
|
||||
#include "zend_interfaces.h"
|
||||
#include "php_globals.h"
|
||||
#include "php_array.h"
|
||||
#include "basic_functions.h"
|
||||
#include "php_string.h"
|
||||
|
@ -17,7 +17,6 @@
|
||||
#include "php.h"
|
||||
#include "php_browscap.h"
|
||||
#include "php_ini.h"
|
||||
#include "php_string.h"
|
||||
|
||||
#include "zend_ini_scanner.h"
|
||||
#include "zend_globals.h"
|
||||
|
@ -21,7 +21,6 @@
|
||||
#include "file.h"
|
||||
#include "php_dir.h"
|
||||
#include "php_dir_int.h"
|
||||
#include "php_string.h"
|
||||
#include "php_scandir.h"
|
||||
#include "basic_functions.h"
|
||||
#include "dir_arginfo.h"
|
||||
|
@ -19,11 +19,9 @@
|
||||
#include "php.h"
|
||||
#include <ctype.h>
|
||||
#include "php_string.h"
|
||||
#include "ext/standard/head.h"
|
||||
#include "ext/standard/file.h"
|
||||
#include "basic_functions.h"
|
||||
#include "exec.h"
|
||||
#include "php_globals.h"
|
||||
#include "SAPI.h"
|
||||
|
||||
#ifdef HAVE_SYS_WAIT_H
|
||||
|
@ -22,9 +22,7 @@
|
||||
/* {{{ includes */
|
||||
|
||||
#include "php.h"
|
||||
#include "php_globals.h"
|
||||
#include "ext/standard/flock_compat.h"
|
||||
#include "ext/standard/exec.h"
|
||||
#include "ext/standard/php_filestat.h"
|
||||
#include "php_open_temporary_file.h"
|
||||
#include "ext/standard/basic_functions.h"
|
||||
@ -61,7 +59,6 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include "ext/standard/head.h"
|
||||
#include "php_string.h"
|
||||
#include "file.h"
|
||||
|
||||
@ -73,14 +70,9 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
# include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#include "fsock.h"
|
||||
#include "fopen_wrappers.h"
|
||||
#include "streamsfuncs.h"
|
||||
#include "php_globals.h"
|
||||
#include "streamsfuncs.h" /* To define constants in the arg_info */
|
||||
|
||||
#ifdef HAVE_SYS_FILE_H
|
||||
# include <sys/file.h>
|
||||
|
@ -19,7 +19,6 @@
|
||||
*/
|
||||
|
||||
#include "php.h"
|
||||
#include "php_globals.h"
|
||||
#include "ext/standard/basic_functions.h"
|
||||
#include "ext/standard/file.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
|
@ -16,14 +16,11 @@
|
||||
|
||||
#include <math.h> /* modf() */
|
||||
#include "php.h"
|
||||
#include "ext/standard/head.h"
|
||||
#include "php_string.h"
|
||||
#include "zend_execute.h"
|
||||
#include <stdio.h>
|
||||
|
||||
#include <locale.h>
|
||||
#ifdef ZTS
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/standard/php_string.h" /* for localeconv_r() */
|
||||
#define LCONV_DECIMAL_POINT (*lconv.decimal_point)
|
||||
#else
|
||||
#define LCONV_DECIMAL_POINT (*lconv->decimal_point)
|
||||
|
@ -41,12 +41,8 @@
|
||||
#include <php_config.h>
|
||||
#endif
|
||||
#include "php_standard.h"
|
||||
#include "php_string.h"
|
||||
#include "SAPI.h"
|
||||
#include <locale.h>
|
||||
#ifdef HAVE_LANGINFO_H
|
||||
#include <langinfo.h>
|
||||
#endif
|
||||
|
||||
#include <zend_hash.h>
|
||||
#include "html_tables.h"
|
||||
|
@ -15,7 +15,6 @@
|
||||
*/
|
||||
|
||||
#include "php.h"
|
||||
#include "php_string.h"
|
||||
|
||||
/* {{{ reference_levdist
|
||||
* reference implementation, only optimized for memory usage, not speed */
|
||||
|
@ -15,8 +15,6 @@
|
||||
*/
|
||||
|
||||
#include "php.h"
|
||||
#include "php_filestat.h"
|
||||
#include "php_globals.h"
|
||||
|
||||
#if defined(HAVE_SYMLINK) || defined(PHP_WIN32)
|
||||
|
||||
|
@ -39,7 +39,6 @@
|
||||
#include "php_syslog.h"
|
||||
#include "php_mail.h"
|
||||
#include "php_ini.h"
|
||||
#include "php_string.h"
|
||||
#include "exec.h"
|
||||
|
||||
#ifdef PHP_WIN32
|
||||
|
@ -28,8 +28,6 @@
|
||||
#else
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
#include "ext/standard/head.h"
|
||||
#include "php_string.h"
|
||||
#include "pack.h"
|
||||
#ifdef HAVE_PWD_H
|
||||
#ifdef PHP_WIN32
|
||||
|
@ -15,15 +15,11 @@
|
||||
*/
|
||||
|
||||
#include "php.h"
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <signal.h>
|
||||
#include "php_string.h"
|
||||
#include "ext/standard/head.h"
|
||||
#include "ext/standard/basic_functions.h"
|
||||
#include "ext/standard/file.h"
|
||||
#include "exec.h"
|
||||
#include "php_globals.h"
|
||||
#include "SAPI.h"
|
||||
#include "main/php_network.h"
|
||||
#include "zend_smart_str.h"
|
||||
|
@ -16,9 +16,7 @@
|
||||
|
||||
#include "php.h"
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include <ctype.h>
|
||||
#include "php_string.h"
|
||||
|
||||
/* Simple soundex algorithm as described by Knuth in TAOCP, vol 3 */
|
||||
/* {{{ Calculate the soundex key of a string */
|
||||
|
@ -16,11 +16,8 @@
|
||||
*/
|
||||
|
||||
#include "php.h"
|
||||
#include "php_globals.h"
|
||||
#include "ext/standard/flock_compat.h"
|
||||
#include "ext/standard/file.h"
|
||||
#include "ext/standard/php_filestat.h"
|
||||
#include "php_open_temporary_file.h"
|
||||
#include "ext/standard/basic_functions.h"
|
||||
#include "php_ini.h"
|
||||
#include "streamsfuncs.h"
|
||||
|
@ -32,7 +32,6 @@
|
||||
#include "scanf.h"
|
||||
#include "zend_API.h"
|
||||
#include "zend_execute.h"
|
||||
#include "php_globals.h"
|
||||
#include "basic_functions.h"
|
||||
#include "zend_smart_str.h"
|
||||
#include <Zend/zend_exceptions.h>
|
||||
|
@ -26,8 +26,6 @@
|
||||
#include "fopen_wrappers.h"
|
||||
#include "php_zip.h"
|
||||
|
||||
#include "ext/standard/url.h"
|
||||
|
||||
/* needed for ssize_t definition */
|
||||
#include <sys/types.h>
|
||||
|
||||
|
@ -26,7 +26,6 @@
|
||||
#include "SAPI.h"
|
||||
#include "php_ini.h"
|
||||
#include "ext/standard/info.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "php_zlib.h"
|
||||
#include "zlib_arginfo.h"
|
||||
|
||||
|
@ -24,8 +24,6 @@
|
||||
#include "SAPI.h"
|
||||
#include "php_variables.h"
|
||||
#include "php_ini.h"
|
||||
#include "ext/standard/php_string.h"
|
||||
#include "ext/standard/pageinfo.h"
|
||||
#ifdef ZTS
|
||||
#include "TSRM.h"
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user