Revert "Zend/zend_types.h: move zend_uchar.h to zend_char.h"

This reverts commit 42577c6b6b.

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"

Zend/zend_char.h

@@ -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 */

Zend/zend_string.h

@@ -20,7 +20,6 @@
 #define ZEND_STRING_H
 
 #include "zend.h"
-#include "zend_char.h"
 
 BEGIN_EXTERN_C()
 

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