From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Mon, 3 Nov 2014 23:09:18 +0000 (+0000)
Subject: Fix definition of surrogate macros.
X-Git-Tag: 0.64~40
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=51346a54f76f49442c3c7b37ec99695db57638a3;hp=-c;p=PuTTY.git

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.
---

51346a54f76f49442c3c7b37ec99695db57638a3
diff --git a/putty.h b/putty.h
index ff0f3156..5e043960 100644
--- a/putty.h
+++ b/putty.h
@@ -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) && \