Update contrib/libs/jdk to 25+4

commit_hash:2c87f199d326a14ece1c11f5f15d1f247a6c4e50

4 files changed, 16 insertions, 9 deletions

diff --git a/contrib/libs/jdk/include/jni.h b/contrib/libs/jdk/include/jni.h
index c85da1bc67..1a31c38b3c 100644
--- a/contrib/libs/jdk/include/jni.h
+++ b/contrib/libs/jdk/include/jni.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -48,6 +48,8 @@
 extern "C" {
 #endif
 
+#define JNICALL
+
 /*
  * JNI Types
  */
@@ -775,6 +777,12 @@ struct JNINativeInterface_ {
 
     jboolean (JNICALL *IsVirtualThread)
        (JNIEnv* env, jobject obj);
+
+    /* Large UTF8 Support */
+
+    jlong (JNICALL *GetStringUTFLengthAsLong)
+      (JNIEnv *env, jstring str);
+
 };
 
 /*
@@ -1623,6 +1631,9 @@ struct JNIEnv_ {
     jsize GetStringUTFLength(jstring str) {
         return functions->GetStringUTFLength(this,str);
     }
+    jlong GetStringUTFLengthAsLong(jstring str) {
+        return functions->GetStringUTFLengthAsLong(this,str);
+    }
     const char* GetStringUTFChars(jstring str, jboolean *isCopy) {
         return functions->GetStringUTFChars(this,str,isCopy);
     }
@@ -1993,6 +2004,7 @@ JNI_OnUnload(JavaVM *vm, void *reserved);
 #define JNI_VERSION_19  0x00130000
 #define JNI_VERSION_20  0x00140000
 #define JNI_VERSION_21  0x00150000
+#define JNI_VERSION_24  0x00180000
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/contrib/libs/jdk/include/jni_md-linux.h b/contrib/libs/jdk/include/jni_md-linux.h
index 6e583da714..b4ed87e0c4 100644
--- a/contrib/libs/jdk/include/jni_md-linux.h
+++ b/contrib/libs/jdk/include/jni_md-linux.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,8 +52,6 @@
   #define JNIIMPORT
 #endif
 
-#define JNICALL
-
 typedef int jint;
 #ifdef _LP64
 typedef long jlong;
diff --git a/contrib/libs/jdk/include/jni_md-osx.h b/contrib/libs/jdk/include/jni_md-osx.h
index 6e583da714..b4ed87e0c4 100644
--- a/contrib/libs/jdk/include/jni_md-osx.h
+++ b/contrib/libs/jdk/include/jni_md-osx.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -52,8 +52,6 @@
   #define JNIIMPORT
 #endif
 
-#define JNICALL
-
 typedef int jint;
 #ifdef _LP64
 typedef long jlong;
diff --git a/contrib/libs/jdk/include/jni_md-win.h b/contrib/libs/jdk/include/jni_md-win.h
index f795421937..6d217733d8 100644
--- a/contrib/libs/jdk/include/jni_md-win.h
+++ b/contrib/libs/jdk/include/jni_md-win.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
   #define JNIEXPORT __declspec(dllexport)
 #endif
 #define JNIIMPORT __declspec(dllimport)
-#define JNICALL __stdcall
 
 typedef int jint;
 typedef long long jlong;