Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 2d3427c

Browse files
committed
Revert "#include cleanup (#10216)"
Cf. <#10220 (comment)>. This reverts commit e628c66.
1 parent c8955c0 commit 2d3427c

File tree

9 files changed

+10
-22
lines changed

9 files changed

+10
-22
lines changed

‎Zend/zend_alloc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
* with more specialized routines when the requested size is known.
5252
*/
5353

54-
#include "zend_alloc.h"
5554
#include "zend.h"
55+
#include "zend_alloc.h"
5656
#include "zend_globals.h"
5757
#include "zend_operators.h"
5858
#include "zend_multiply.h"

‎Zend/zend_alloc.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
#ifndef ZEND_ALLOC_H
2222
#define ZEND_ALLOC_H
2323

24-
#include "zend_portability.h" // for BEGIN_EXTERN_C
25-
#include "zend_types.h" // for zend_result
24+
#include <stdio.h>
25+
26+
#include "../TSRM/TSRM.h"
27+
#include "zend.h"
2628

2729
#ifndef ZEND_MM_ALIGNMENT
2830
# error "ZEND_MM_ALIGNMENT was not defined during configure"

‎Zend/zend_hash.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
+----------------------------------------------------------------------+
1919
*/
2020

21-
#include "zend_hash.h"
2221
#include "zend.h"
2322
#include "zend_globals.h"
2423
#include "zend_variables.h"

‎Zend/zend_hash.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,8 @@
2121
#ifndef ZEND_HASH_H
2222
#define ZEND_HASH_H
2323

24-
#include "zend_alloc.h" // for pefree()
25-
#include "zend_long.h"
26-
#include "zend_portability.h" // for BEGIN_EXTERN_C
27-
#include "zend_sort.h" // for zend_sort()
28-
#include "zend_string.h" // for ZSTR_VAL()
24+
#include "zend.h"
25+
#include "zend_sort.h"
2926

3027
#define HASH_KEY_IS_STRING 1
3128
#define HASH_KEY_IS_LONG 2

‎Zend/zend_portability.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
#ifndef ZEND_PORTABILITY_H
2222
#define ZEND_PORTABILITY_H
2323

24-
#ifdef PHP_WIN32
25-
#include "config.w32.h"
26-
#else
27-
#include "php_config.h" // for HAVE_*
28-
#endif
29-
3024
#ifdef __cplusplus
3125
#define BEGIN_EXTERN_C() extern "C" {
3226
#define END_EXTERN_C() }

‎Zend/zend_sort.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
+----------------------------------------------------------------------+
1818
*/
1919

20+
#include "zend.h"
2021
#include "zend_sort.h"
22+
#include <limits.h>
2123

2224
static inline void zend_sort_2(void *a, void *b, compare_func_t cmp, swap_func_t swp) /* {{{ */ {
2325
if (cmp(a, b) > 0) {

‎Zend/zend_sort.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020
#ifndef ZEND_SORT_H
2121
#define ZEND_SORT_H
2222

23-
#include "zend_portability.h" // for BEGIN_EXTERN_C
24-
#include "zend_types.h" // for compare_func_t, swap_func_t
25-
2623
BEGIN_EXTERN_C()
2724
ZEND_API void zend_sort(void *base, size_t nmemb, size_t siz, compare_func_t cmp, swap_func_t swp);
2825
ZEND_API void zend_insert_sort(void *base, size_t nmemb, size_t siz, compare_func_t cmp, swap_func_t swp);

‎Zend/zend_string.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
+----------------------------------------------------------------------+
1717
*/
1818

19-
#include "zend_string.h"
2019
#include "zend.h"
2120
#include "zend_globals.h"
2221

‎Zend/zend_string.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
#ifndef ZEND_STRING_H
2020
#define ZEND_STRING_H
2121

22-
#include "zend_alloc.h" // for pemalloc()
23-
#include "zend_portability.h" // for BEGIN_EXTERN_C
24-
#include "zend_types.h" // for zend_string
22+
#include "zend.h"
2523

2624
BEGIN_EXTERN_C()
2725

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /