Skip to content

Commit 964ca22

Browse files
author
duke
committed
Backport 67dfdfa6ea829fcd1ecac0df8211b591ad15f859
1 parent f0a16d4 commit 964ca22

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

test/hotspot/jtreg/vmTestbase/nsk/share/native/native_thread.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -98,7 +98,11 @@ void* procedure(void* t) {
9898
thread->started = 1;
9999
thread->status = thread->procedure(thread->context);
100100
thread->finished = 1;
101+
#ifdef windows
101102
return 0;
103+
#else // !windows
104+
return nullptr;
105+
#endif
102106
}
103107

104108
/**

test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_list.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2004, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -109,7 +109,7 @@ int nsk_list_remove(const void *plist, int ind) {
109109
list_info->arr[i - 1] = list_info->arr[i];
110110
}
111111
}
112-
list_info->arr[--list_info->elements_count] = 0;
112+
list_info->arr[--list_info->elements_count] = nullptr;
113113

114114
return NSK_TRUE;
115115
}

0 commit comments

Comments
 (0)