From: Po Lu <luangruo@yahoo.com>
Date: Sun, 15 Sep 2024 00:52:46 +0000 (+0800)
Subject: Port to Haiku R1/beta5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=931283e9b6baaee7e458bdd6f276909471be2aeb;p=emacs.git

Port to Haiku R1/beta5

* src/haiku_support.cc (keysym_from_raw_char): Use revised names
for B_HANGUL and B_HANGUL_HANJA.

(cherry picked from commit 709ce2aff146a8c09c191f818cda70b269902348)
---

diff --git a/src/haiku_support.cc b/src/haiku_support.cc
index 08e7f29685a..4ea5e0884b9 100644
--- a/src/haiku_support.cc
+++ b/src/haiku_support.cc
@@ -340,10 +340,18 @@ keysym_from_raw_char (int32 raw, int32 key, unsigned *code)
 
       break;
 
+#if B_HAIKU_VERSION >= B_HAIKU_VERSION_1_BETA_5
+    case B_HANGUL_KEY:
+#else /* B_HAIKU_VERSION < B_HAIKU_VERSION_1_BETA_5 */
     case B_HANGUL:
+#endif /* B_HAIKU_VERSION >= B_HAIKU_VERSION_1_BETA_5 */
       *code = KEY_HANGUL;
       break;
-    case B_HANGUL_HANJA:
+#if B_HAIKU_VERSION >= B_HAIKU_VERSION_1_BETA_5
+    case B_HANGUL_HANJA_KEY:
+#else /* B_HAIKU_VERSION < B_HAIKU_VERSION_1_BETA_5 */
+    case B_HANGUL:
+#endif /* B_HAIKU_VERSION >= B_HAIKU_VERSION_1_BETA_5 */
       *code = KEY_HANGUL_HANJA;
       break;
     case B_KATAKANA_HIRAGANA: