Fix definition of surrogate macros.

Define HIGH_SURROGATE_START etc even if IS_HIGH_SURROGATE is defined,
as they are used elsewhere too. This is necessary to build with recent
MinGW.
This commit is contained in:
Jacob Nevins 2014-11-03 23:09:18 +00:00
Родитель eac7e041f1
Коммит 51346a54f7
1 изменённых файлов: 3 добавлений и 1 удалений

Просмотреть файл

@ -1441,12 +1441,14 @@ void request_callback_notifications(toplevel_callback_notify_fn_t notify,
#endif
/* SURROGATE PAIR */
#ifndef IS_HIGH_SURROGATE
#define HIGH_SURROGATE_START 0xd800
#define HIGH_SURROGATE_END 0xdbff
#define LOW_SURROGATE_START 0xdc00
#define LOW_SURROGATE_END 0xdfff
/* These macros exist in the Windows API, so the environment may
* provide them. If not, define them in terms of the above. */
#ifndef IS_HIGH_SURROGATE
#define IS_HIGH_SURROGATE(wch) (((wch) >= HIGH_SURROGATE_START) && \
((wch) <= HIGH_SURROGATE_END))
#define IS_LOW_SURROGATE(wch) (((wch) >= LOW_SURROGATE_START) && \