Skip to content

Commit 3fc9839

Browse files
committed
[GR-70998] Fix shim exports for AWT on Windows.
PullRequest: graal/22456
2 parents bc9b0e5 + 0bf8762 commit 3fc9839

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jdk/JNIRegistrationAWTSupport.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public void afterAnalysis(AfterAnalysisAccess access) {
4646
JNIRegistrationSupport jniRegistrationSupport = JNIRegistrationSupport.singleton();
4747
if (jniRegistrationSupport.isRegisteredLibrary("awt")) {
4848
jniRegistrationSupport.addJvmShimExports(
49-
"jio_snprintf",
5049
"JVM_IsStaticallyLinked");
5150
jniRegistrationSupport.addJavaShimExports(
5251
"JNU_CallMethodByName",
@@ -62,7 +61,8 @@ public void afterAnalysis(AfterAnalysisAccess access) {
6261
"JNU_ThrowIllegalArgumentException",
6362
"JNU_ThrowInternalError",
6463
"JNU_ThrowNullPointerException",
65-
"JNU_ThrowOutOfMemoryError");
64+
"JNU_ThrowOutOfMemoryError",
65+
"jio_snprintf");
6666
if (isWindows()) {
6767
jniRegistrationSupport.addJvmShimExports(
6868
"JVM_CurrentTimeMillis",
@@ -94,14 +94,8 @@ public void afterAnalysis(AfterAnalysisAccess access) {
9494
jniRegistrationSupport.addJavaShimExports(
9595
"JNU_GetEnv",
9696
"JNU_ThrowByName",
97-
"JNU_ThrowNullPointerException");
98-
if (isWindows()) {
99-
jniRegistrationSupport.addJavaShimExports(
100-
"jio_snprintf");
101-
} else {
102-
jniRegistrationSupport.addJvmShimExports(
103-
"jio_snprintf");
104-
}
97+
"JNU_ThrowNullPointerException",
98+
"jio_snprintf");
10599
}
106100
}
107101

0 commit comments

Comments
 (0)