|
Line
Link Here
|
| 0 |
-- /Source/JavaScriptCore/API/JSStringRef.h |
0 |
++ /Source/JavaScriptCore/API/JSStringRef.h |
|
Lines 26-31
Link Here
|
| 26 |
#ifndef JSStringRef_h |
26 |
#ifndef JSStringRef_h |
| 27 |
#define JSStringRef_h |
27 |
#define JSStringRef_h |
| 28 |
|
28 |
|
|
|
29 |
#include <unicode/umachine.h> |
| 29 |
#include <JavaScriptCore/JSValueRef.h> |
30 |
#include <JavaScriptCore/JSValueRef.h> |
| 30 |
|
31 |
|
| 31 |
#ifndef __cplusplus |
32 |
#ifndef __cplusplus |
|
Lines 37-52
Link Here
|
| 37 |
extern "C" { |
38 |
extern "C" { |
| 38 |
#endif |
39 |
#endif |
| 39 |
|
40 |
|
| 40 |
#if !defined(WIN32) && !defined(_WIN32) \ |
|
|
| 41 |
&& !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ |
| 42 |
/*! |
41 |
/*! |
| 43 |
@typedef JSChar |
42 |
@typedef JSChar |
| 44 |
@abstract A Unicode character. |
43 |
@abstract A Unicode character. |
| 45 |
*/ |
44 |
*/ |
| 46 |
typedef unsigned short JSChar; |
45 |
typedef UChar JSChar; |
| 47 |
#else |
|
|
| 48 |
typedef wchar_t JSChar; |
| 49 |
#endif |
| 50 |
|
46 |
|
| 51 |
/*! |
47 |
/*! |
| 52 |
@function |
48 |
@function |
| 53 |
-- /Source/WTF/wtf/TypeTraits.h |
49 |
++ /Source/WTF/wtf/TypeTraits.h |
|
Lines 72-77
Link Here
|
| 72 |
template<> struct IsInteger<unsigned long> { static const bool value = true; }; |
72 |
template<> struct IsInteger<unsigned long> { static const bool value = true; }; |
| 73 |
template<> struct IsInteger<long long> { static const bool value = true; }; |
73 |
template<> struct IsInteger<long long> { static const bool value = true; }; |
| 74 |
template<> struct IsInteger<unsigned long long> { static const bool value = true; }; |
74 |
template<> struct IsInteger<unsigned long long> { static const bool value = true; }; |
|
|
75 |
template<> struct IsInteger<char16_t> { static const bool value = true; }; |
| 76 |
template<> struct IsInteger<char32_t> { static const bool value = true; }; |
| 75 |
#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) |
77 |
#if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) |
| 76 |
template<> struct IsInteger<wchar_t> { static const bool value = true; }; |
78 |
template<> struct IsInteger<wchar_t> { static const bool value = true; }; |
| 77 |
#endif |
79 |
#endif |
| 78 |
-- /Source/WebKit2/Shared/API/c/WKString.h |
80 |
++ /Source/WebKit2/Shared/API/c/WKString.h |
|
Lines 26-31
Link Here
|
| 26 |
#ifndef WKString_h |
26 |
#ifndef WKString_h |
| 27 |
#define WKString_h |
27 |
#define WKString_h |
| 28 |
|
28 |
|
|
|
29 |
#include <unicode/umachine.h> |
| 29 |
#include <WebKit2/WKBase.h> |
30 |
#include <WebKit2/WKBase.h> |
| 30 |
|
31 |
|
| 31 |
#ifndef __cplusplus |
32 |
#ifndef __cplusplus |
|
Lines 36-47
Link Here
|
| 36 |
extern "C" { |
37 |
extern "C" { |
| 37 |
#endif |
38 |
#endif |
| 38 |
|
39 |
|
| 39 |
#if !defined(WIN32) && !defined(_WIN32) \ |
40 |
typedef UChar WKChar; |
| 40 |
&& !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ |
|
|
| 41 |
typedef unsigned short WKChar; |
| 42 |
#else |
| 43 |
typedef wchar_t WKChar; |
| 44 |
#endif |
| 45 |
|
41 |
|
| 46 |
WK_EXPORT WKTypeID WKStringGetTypeID(); |
42 |
WK_EXPORT WKTypeID WKStringGetTypeID(); |
| 47 |
|
43 |
|
