8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition

Reviewed-by: kvn, shade
sendaoYan · May 27, 2024 · 86eb5d9 · 86eb5d9
1 parent be1d374
commit 86eb5d9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/hotspot/share/prims/downcallLinker.hpp b/src/hotspot/share/prims/downcallLinker.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 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
@@ -41,7 +41,8 @@ class DowncallLinker: AllStatic {
  int captured_state_mask,
  bool needs_transition);
 
- static void capture_state(int32_t* value_ptr, int captured_state_mask);
+ // This is defined as JVM_LEAF which adds the JNICALL modifier.
+ static void JNICALL capture_state(int32_t* value_ptr, int captured_state_mask);
 
  class StubGenerator : public StubCodeGenerator {
  BasicType* _signature;