archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8238380: java.base/unix/native/libjava/childproc.c "multiple definition" link errors with GCC10

Browse source 
Reviewed-by: stuefe, clanger, rriggs
This commit is contained in:
Patrick Zhang 2020-02-04 21:27:10 +08:00 • committed by Patrick Zhang
parent aa3638a32d
commit a59e8a7f6f
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/java.base/unix/native/libjava/childproc.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -34,6 +34,7 @@
#include "childproc.h" #include "childproc.h"
const char * const *parentPathv;
ssize_t ssize_t
restartableWrite(int fd, const void *buf, size_t count) restartableWrite(int fd, const void *buf, size_t count)

4
src/java.base/unix/native/libjava/childproc.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -126,7 +126,7 @@ typedef struct _SpawnInfo {
* The cached and split version of the JDK's effective PATH. * The cached and split version of the JDK's effective PATH.
* (We don't support putenv("PATH=...") in native code) * (We don't support putenv("PATH=...") in native code)
*/ */
const char * const *parentPathv; extern const char * const *parentPathv;
ssize_t restartableWrite(int fd, const void *buf, size_t count); ssize_t restartableWrite(int fd, const void *buf, size_t count);
int restartableDup2(int fd_from, int fd_to); int restartableDup2(int fd_from, int fd_to);