Skip to content

Commit

Permalink
Zend/zend_types.h: move zend_uchar.h to zend_char.h
Browse files Browse the repository at this point in the history
Prepare to fix the cyclic header dependency from `zend_string.h`.
  • Loading branch information
MaxKellermann authored and Girgias committed Feb 26, 2023
1 parent eb34c28 commit 42577c6
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 2 deletions.
1 change: 1 addition & 0 deletions Zend/zend_API.h
Expand Up @@ -22,6 +22,7 @@
#ifndef ZEND_API_H
#define ZEND_API_H

#include "zend_char.h"
#include "zend_modules.h"
#include "zend_list.h"
#include "zend_operators.h"
Expand Down
22 changes: 22 additions & 0 deletions Zend/zend_char.h
@@ -0,0 +1,22 @@
/*
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
| Copyright (c) Zend Technologies Ltd. (http://www.zend.com) |
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.zend.com/license/2_00.txt. |
| If you did not receive a copy of the Zend license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@zend.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
*/

#ifndef ZEND_CHAR_H
#define ZEND_CHAR_H

typedef unsigned char zend_uchar;

#endif /* ZEND_CHAR_H */
1 change: 1 addition & 0 deletions Zend/zend_string.h
Expand Up @@ -20,6 +20,7 @@
#define ZEND_STRING_H

#include "zend.h"
#include "zend_char.h"

BEGIN_EXTERN_C()

Expand Down
2 changes: 0 additions & 2 deletions Zend/zend_types.h
Expand Up @@ -53,8 +53,6 @@
# define ZEND_ENDIAN_LOHI_C_4(a, b, c, d) a, b, c, d
#endif

typedef unsigned char zend_uchar;

#ifdef ZEND_ENABLE_ZVAL_LONG64
# ifdef ZEND_WIN32
# define ZEND_SIZE_MAX _UI64_MAX
Expand Down

0 comments on commit 42577c6

Please sign in to comment.