From 86eb5d9f3be30ff9df1318f18ab73c7129c978f6 Mon Sep 17 00:00:00 2001 From: David Holmes Date: Mon, 27 May 2024 21:52:49 +0000 Subject: [PATCH] 8329958: Windows x86 build fails: downcallLinker.cpp(36) redefinition Reviewed-by: kvn, shade --- src/hotspot/share/prims/downcallLinker.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/hotspot/share/prims/downcallLinker.hpp b/src/hotspot/share/prims/downcallLinker.hpp index 188987efbb5c5..01ee5c5677666 100644 --- 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;