From 8661a7bc8c5cc7d6e5a005b78cba122cbabe555a Mon Sep 17 00:00:00 2001
From: Ishita Ray <ishita.ray@ibm.com>
Date: Mon, 28 Oct 2024 08:49:53 -0400
Subject: [PATCH] Rearrange use of __open_xl__ macro

---
 runtime/compiler/env/alloca_openxl.h          | 2 +-
 runtime/compiler/runtime/RelocationRecord.cpp | 2 +-
 runtime/compiler/runtime/asmprotos.h          | 2 +-
 runtime/j9vm/jvm.c                            | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/runtime/compiler/env/alloca_openxl.h b/runtime/compiler/env/alloca_openxl.h
index aa1b88a15ea..731a8bf0fe6 100644
--- a/runtime/compiler/env/alloca_openxl.h
+++ b/runtime/compiler/env/alloca_openxl.h
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright IBM Corp. and others 2000
+ * Copyright IBM Corp. and others 2024
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
diff --git a/runtime/compiler/runtime/RelocationRecord.cpp b/runtime/compiler/runtime/RelocationRecord.cpp
index 42ad8717eee..5053c53ce6c 100644
--- a/runtime/compiler/runtime/RelocationRecord.cpp
+++ b/runtime/compiler/runtime/RelocationRecord.cpp
@@ -64,7 +64,7 @@
 #endif /* defined(J9VM_OPT_JITSERVER) */
 
 // TODO: move this someplace common for RuntimeAssumptions.cpp and here
-#if (defined(__IBMCPP__) || defined(__open_xl__) && defined(__cplusplus)) && !defined(AIXPPC) && !defined(LINUXPPC)
+#if (defined(__IBMCPP__) || defined(__open_xl__)) && !defined(AIXPPC) && !defined(LINUXPPC)
 #define ASM_CALL __cdecl
 #else
 #define ASM_CALL
diff --git a/runtime/compiler/runtime/asmprotos.h b/runtime/compiler/runtime/asmprotos.h
index 1d4d10179bf..509e87242c9 100644
--- a/runtime/compiler/runtime/asmprotos.h
+++ b/runtime/compiler/runtime/asmprotos.h
@@ -28,7 +28,7 @@ extern "C" {
 #endif
 
 
-#if (defined(__IBMCPP__) || defined(__IBMC__) && !defined(MVS)) && !defined(J9ZOS390) && !defined(LINUXPPC64) || defined(__open_xl__)
+#if (defined(__IBMCPP__) || defined(__IBMC__) || defined(__open_xl__) && !defined(MVS)) && !defined(J9ZOS390) && !defined(LINUXPPC64)
 #if defined(AIXPPC)
 #define JIT_HELPER(x) extern "C" void * x
 #else
diff --git a/runtime/j9vm/jvm.c b/runtime/j9vm/jvm.c
index ffb4bfa8964..0d0963c3e7e 100644
--- a/runtime/j9vm/jvm.c
+++ b/runtime/j9vm/jvm.c
@@ -4401,7 +4401,7 @@ JVM_Available(jint descriptor, jlong* bytes)
 		return JNI_FALSE;
 	}
 
-#if defined(WIN32) && !defined(__IBMC__) && !(defined(__open_xl__) && !defined(__cplusplus))
+#if defined(WIN32) && !defined(__IBMC__) && !defined(__open_xl__)
 	curr = _lseeki64(descriptor, 0, SEEK_CUR);
 	if (curr==-1L) {
 		if (descriptor == 0) {
@@ -4544,11 +4544,11 @@ JVM_Lseek(jint descriptor, jlong bytesToSeek, jint origin)
 	}
 
 #if defined(WIN32)
-#if defined(__IBMC__) || defined(__open_xl__) && !defined(__cplusplus)
+#if defined(__IBMC__) || defined(__open_xl__)
 	result = lseek(descriptor, (long) bytesToSeek, origin);
-#else
+#else /* defined(__IBMC__) || defined(__open_xl__) */
 	result = _lseeki64(descriptor, bytesToSeek, origin);
-#endif
+#endif /* defined(__IBMC__) || defined(__open_xl__) */
 #elif defined(J9UNIX) || defined(J9ZOS390) /* defined(WIN32) */
 #if defined(LINUX) && !defined(J9VM_ENV_DATA64)