Skip to content

Commit 42577c6

Browse files
MaxKellermannGirgias
authored andcommitted
Zend/zend_types.h: move zend_uchar.h to zend_char.h
Prepare to fix the cyclic header dependency from `zend_string.h`.
1 parent eb34c28 commit 42577c6

File tree

4 files changed

+24
-2
lines changed

4 files changed

+24
-2
lines changed

Zend/zend_API.h

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#ifndef ZEND_API_H
2323
#define ZEND_API_H
2424

25+
#include "zend_char.h"
2526
#include "zend_modules.h"
2627
#include "zend_list.h"
2728
#include "zend_operators.h"

Zend/zend_char.h

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
/*
2+
+----------------------------------------------------------------------+
3+
| Zend Engine |
4+
+----------------------------------------------------------------------+
5+
| Copyright (c) Zend Technologies Ltd. (http://www.zend.com) |
6+
+----------------------------------------------------------------------+
7+
| This source file is subject to version 2.00 of the Zend license, |
8+
| that is bundled with this package in the file LICENSE, and is |
9+
| available through the world-wide-web at the following url: |
10+
| http://www.zend.com/license/2_00.txt. |
11+
| If you did not receive a copy of the Zend license and are unable to |
12+
| obtain it through the world-wide-web, please send a note to |
13+
| [email protected] so we can mail you a copy immediately. |
14+
+----------------------------------------------------------------------+
15+
*/
16+
17+
#ifndef ZEND_CHAR_H
18+
#define ZEND_CHAR_H
19+
20+
typedef unsigned char zend_uchar;
21+
22+
#endif /* ZEND_CHAR_H */

Zend/zend_string.h

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#define ZEND_STRING_H
2121

2222
#include "zend.h"
23+
#include "zend_char.h"
2324

2425
BEGIN_EXTERN_C()
2526

Zend/zend_types.h

-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@
5353
# define ZEND_ENDIAN_LOHI_C_4(a, b, c, d) a, b, c, d
5454
#endif
5555

56-
typedef unsigned char zend_uchar;
57-
5856
#ifdef ZEND_ENABLE_ZVAL_LONG64
5957
# ifdef ZEND_WIN32
6058
# define ZEND_SIZE_MAX _UI64_MAX

0 commit comments

Comments
 (0)