diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-06-19 13:09:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 13:09:25 +0200 |
| commit | df202127e3096c7e8b5188c4d29f38b03cae1658 (patch) | |
| tree | 7aa338b6b9ff228fe681fe79883b2e76231128fd /core/ustring.h | |
| parent | b9f944ed5c68f6b2d23866cd718510596080749c (diff) | |
| parent | 449571b6cd48083fb34a4f7aebe6758cd527afc9 (diff) | |
Merge pull request #5281 from J08nY/useless-preprocessor
Fix #5263: Useless preprocessor condition
Diffstat (limited to 'core/ustring.h')
| -rw-r--r-- | core/ustring.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/ustring.h b/core/ustring.h index 95096e8f76..8aceb0748c 100644 --- a/core/ustring.h +++ b/core/ustring.h @@ -46,11 +46,9 @@ public: operator const char*() {return get_data();}; }; -#ifndef CHARTYPE_16BITS + typedef wchar_t CharType; -#else -typedef wchar_t uint16_t; -#endif + struct StrRange { |