Merge pull request #445 from pshipton/sysprops

Include System.c natives to make use of SystemProps$Raw
ibmruntimes · Feb 28, 2025 · 5aefb3b · 5aefb3b
2 parents a50a544 + 5393df9
commit 5aefb3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 23 deletions.
diff --git a/closed/src/java.base/share/native/libjava/System.c b/closed/src/java.base/share/native/libjava/System.c
diff --git a/src/java.base/share/native/libjava/System.c b/src/java.base/share/native/libjava/System.c
@@ -23,6 +23,12 @@
  * questions.
  */
 
+/*
+ * ===========================================================================
+ * (c) Copyright IBM Corp. 2025, 2025 All Rights Reserved
+ * ===========================================================================
+ */
+
 #include <string.h>
 
 #include "jni.h"
@@ -289,6 +295,7 @@ Java_java_lang_System_setErr0(JNIEnv *env, jclass cla, jobject stream)
     (*env)->SetStaticObjectField(env,cla,fid,stream);
 }
 
+#if 0 /* Exclude mapLibraryName so it doesn't conflict with the OpenJ9 native. */
 static void cpchars(jchar *dst, char *src, int n)
 {
     int i;
@@ -322,3 +329,4 @@ Java_java_lang_System_mapLibraryName(JNIEnv *env, jclass ign, jstring libname)
 
     return (*env)->NewString(env, chars, len);
 }
+#endif /* Exclude mapLibraryName so it doesn't conflict with the OpenJ9 native. */