Merge pull request #7323 from Deigue/openxl-wrkrd

Open XL segfault fix and workaround for si.cpp macro collision
eclipse-omr · May 1, 2024 · acd6f7e · acd6f7e
2 parents 76d1f00 + 687ed48
commit acd6f7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/fvtest/porttest/si.cpp b/fvtest/porttest/si.cpp
@@ -42,6 +42,7 @@
 #include <direct.h>
 #endif /* defined(OMR_OS_WINDOWS) */
 #if !defined(OMR_OS_WINDOWS)
+#include <locale>
 #include <grp.h>
 #include <errno.h>
 #if defined(J9ZOS390)

diff --git a/thread/zos390/rasthrsup.c b/thread/zos390/rasthrsup.c
@@ -26,5 +26,6 @@
 uintptr_t
 omrthread_get_ras_tid(void)
 {
-	return (uintptr_t)(*(uint32_t *)pthread_self().__);
+	pthread_t id = pthread_self();
+	return (uintptr_t)*(unsigned long long *)&id;
 }