* beos.cpp: Define PTHREAD_RECURSIVE_MUTEX_INITIALIZER, B_HANGUL and

  B_HANGUL_HANJA macros which are dropped in r1beta6.

Author: arakiken

.github/workflows/ci.yml

@@ -384,7 +384,6 @@ jobs:
       with:
         usesh: true
         prepare: |
-          # workaround until R1 Beta6 is released.
           #yes | pkgman drop-repo HaikuPorts
           #pkgman add-repo https://eu.hpkg.haiku-os.org/haikuports/master/$(getarch)/current
           (pkgman refresh && pkgman update && pkgman install -y libsdl2_devel gtk3_devel) || echo libsdl2_devel or gtk3_devel is not installed.

ChangeLog

@@ -1,5 +1,8 @@
 2026-08-29  Araki Ken <arakiken@user.sf.net>
 
+	* beos.cpp: Define PTHREAD_RECURSIVE_MUTEX_INITIALIZER, B_HANGUL and
+	  B_HANGUL_HANJA macros which are dropped in r1beta6.
+
 	* ui_font_manager.c: ui_get_font() returns a font with size_attr for
 	  DRCS charset.
 

uitoolkit/beos/beos.cpp

@@ -21,6 +21,23 @@
 
 #include <pthread.h>
 
+/* Backward compatibility macros for R1 Beta6 or later */
+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#endif
+#endif
+#ifndef B_HANGUL
+#ifdef B_HANGUL_KEY
+#define B_HANGUL B_HANGUL_KEY
+#endif
+#endif
+#ifndef B_HANGUL_HANJA
+#ifdef B_HANGUL_HANJA_KEY
+#define B_HANGUL_HANJA B_HANGUL_HANJA_KEY
+#endif
+#endif
+
 extern "C" {
 #include "ui_window.h"
 #include "beos.h"