diff --git a/Zend/zend_API.h b/Zend/zend_API.h index db6ad3fbde1..9407fe1c1b5 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -22,7 +22,6 @@ #ifndef ZEND_API_H #define ZEND_API_H -#include "zend_char.h" #include "zend_modules.h" #include "zend_list.h" #include "zend_operators.h" diff --git a/Zend/zend_char.h b/Zend/zend_char.h deleted file mode 100644 index 0a4af72baa1..00000000000 --- a/Zend/zend_char.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | 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 */ diff --git a/Zend/zend_string.h b/Zend/zend_string.h index d53f351b110..ae394dbdb7b 100644 --- a/Zend/zend_string.h +++ b/Zend/zend_string.h @@ -20,7 +20,6 @@ #define ZEND_STRING_H #include "zend.h" -#include "zend_char.h" BEGIN_EXTERN_C() diff --git a/Zend/zend_types.h b/Zend/zend_types.h index 48854039d41..62744548ad0 100644 --- a/Zend/zend_types.h +++ b/Zend/zend_types.h @@ -53,6 +53,8 @@ # 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