Skip to content

Commit

Permalink
Rearrange use of __open_xl__ macro
Browse files Browse the repository at this point in the history
  • Loading branch information
ishitaR88 authored and midronij committed Nov 27, 2024
1 parent 2c6610f commit 8661a7b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion runtime/compiler/env/alloca_openxl.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/runtime/RelocationRecord.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion runtime/compiler/runtime/asmprotos.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions runtime/j9vm/jvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit 8661a7b

Please sign in to comment.