Use Platform.includedIn(Platform.WINDOWS.class) to detect Windows when registering FFM descriptors

steve-s · steve-s · commit 42612d39fa4f · 2025-06-06T13:58:56.000+02:00
diff --git a/sdk/src/org.graalvm.shadowed.org.jline.jdk22/src/org/graalvm/shadowed/org/jline/terminal/impl/ffm/FFMTerminalProviderLoader.java b/sdk/src/org.graalvm.shadowed.org.jline.jdk22/src/org/graalvm/shadowed/org/jline/terminal/impl/ffm/FFMTerminalProviderLoader.java
@@ -46,6 +46,7 @@
 import java.lang.foreign.StructLayout;
 import java.lang.foreign.ValueLayout;
 
+import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.hosted.Feature;
 import org.graalvm.nativeimage.hosted.RuntimeForeignAccess;
 import org.graalvm.shadowed.org.jline.terminal.spi.TerminalProvider;
@@ -100,7 +101,7 @@ private static DowncallDesc[] getWindowsDowncalls() {
     }
 
     private static DowncallDesc[] getDowncalls() {
-        if (System.getProperty("os.name").toLowerCase().contains("windows")) {
+        if (Platform.includedIn(Platform.WINDOWS.class)) {
             return getWindowsDowncalls();
         }
         return getUnixDowncalls();

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`	`import java.lang.foreign.StructLayout;`
`47`	`47`	`import java.lang.foreign.ValueLayout;`
`48`	`48`
	`49`	`+import org.graalvm.nativeimage.Platform;`
`49`	`50`	`import org.graalvm.nativeimage.hosted.Feature;`
`50`	`51`	`import org.graalvm.nativeimage.hosted.RuntimeForeignAccess;`
`51`	`52`	`import org.graalvm.shadowed.org.jline.terminal.spi.TerminalProvider;`
`@@ -100,7 +101,7 @@ private static DowncallDesc[] getWindowsDowncalls() {`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`private static DowncallDesc[] getDowncalls() {`
`103`		`- if (System.getProperty("os.name").toLowerCase().contains("windows")) {`
	`104`	`+ if (Platform.includedIn(Platform.WINDOWS.class)) {`
`104`	`105`	`return getWindowsDowncalls();`
`105`	`106`	`}`
`106`	`107`	`return getUnixDowncalls();`