mirror of
https://github.com/reactos/reactos.git
synced 2024-10-15 05:37:44 +00:00
- Always include "wine/unicode.h" before all other headers, when we need the wchar_t type.
unicode.h includes windef.h, which includes winnt.h, which has the handling for the wchar_t type. As it's the first included header, no other wchar_t type will be defined before. - Remove the wchar_t definition from the Makefile as the winnt.h header will define it as "unsigned short" automatically. svn path=/trunk/; revision=28423
This commit is contained in:
parent
fd468bc98a
commit
cddcaa508e
|
@ -18,10 +18,8 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <windef.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
#include "wine/unicode.h"
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
/* Everything below this line is generated automatically by cpmap.pl */
|
/* Everything below this line is generated automatically by cpmap.pl */
|
||||||
/* ### cpmap begin ### */
|
/* ### cpmap begin ### */
|
||||||
|
|
|
@ -18,9 +18,8 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
#include "wine/unicode.h"
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
/* get the decomposition of a Unicode char */
|
/* get the decomposition of a Unicode char */
|
||||||
static int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen )
|
static int get_decomposition( WCHAR src, WCHAR *dst, unsigned int dstlen )
|
||||||
|
|
|
@ -18,11 +18,10 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "wine/unicode.h"
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
|
||||||
|
|
||||||
extern const WCHAR wine_casemap_lower[];
|
extern const WCHAR wine_casemap_lower[];
|
||||||
extern const WCHAR wine_casemap_upper[];
|
extern const WCHAR wine_casemap_upper[];
|
||||||
extern const unsigned short wine_wctype_table[];
|
extern const unsigned short wine_wctype_table[];
|
||||||
|
|
|
@ -96,7 +96,6 @@ UNICODE_OBJECTS = \
|
||||||
|
|
||||||
UNICODE_HOST_CFLAGS = \
|
UNICODE_HOST_CFLAGS = \
|
||||||
-D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \
|
-D__USE_W32API -DWINVER=0x501 -DWINE_UNICODE_API= \
|
||||||
-Dwchar_t="unsigned short" -D_WCHAR_T_DEFINED \
|
|
||||||
-I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/psdk \
|
-I$(UNICODE_BASE) -Iinclude/reactos/wine -Iinclude -Iinclude/psdk \
|
||||||
$(TOOLS_CFLAGS)
|
$(TOOLS_CFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -18,9 +18,8 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
#include "wine/unicode.h"
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
/* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */
|
/* number of following bytes in sequence based on first byte value (for bytes above 0x7f) */
|
||||||
static const char utf8_length[128] =
|
static const char utf8_length[128] =
|
||||||
|
|
|
@ -18,9 +18,8 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "wine/unicode.h"
|
#include "wine/unicode.h"
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
/* search for a character in the unicode_compose_table; helper for compose() */
|
/* search for a character in the unicode_compose_table; helper for compose() */
|
||||||
static inline int binary_search( WCHAR ch, int low, int high )
|
static inline int binary_search( WCHAR ch, int low, int high )
|
||||||
|
|
Loading…
Reference in a new issue