Skip to content

Commit 3147bbd

Browse files
authored
Fix merge issue between corretto patch and JDK-8074840 (#561)
1 parent 066b320 commit 3147bbd

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

jdk/src/share/bin/splashscreen_stubs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ typedef char* (*SplashGetScaledImageName_t)(const char* fileName,
6060
#define INVOKE(name,def) _INVOKE(name,def,return)
6161
#define INVOKEV(name) _INVOKE(name, ,;)
6262

63-
int DoSplashLoadMemory(void* pdata, int size) {
64-
INVOKE(SplashLoadMemory, 0)(pdata, size);
63+
void DoSplashLoadMemory(void* pdata, int size) {
64+
INVOKEV(SplashLoadMemory)(pdata, size);
6565
}
6666

67-
int DoSplashLoadFile(const char* filename) {
68-
INVOKE(SplashLoadFile, 0)(filename);
67+
void DoSplashLoadFile(const char* filename) {
68+
INVOKEV(SplashLoadFile)(filename);
6969
}
7070

7171
void DoSplashInit(void) {

0 commit comments

Comments
 (0)