Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
8238380: java.base/unix/native/libjava/childproc.c "multiple definiti…
…on" link errors with GCC10
Reviewed-by: stuefe, clanger, rriggs
- Loading branch information
|
|
@@ -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. |
|
|
* |
|
|
* This code is free software; you can redistribute it and/or modify it |
|
@@ -34,6 +34,7 @@ |
|
|
|
|
|
#include "childproc.h" |
|
|
|
|
|
const char * const *parentPathv; |
|
|
|
|
|
ssize_t |
|
|
restartableWrite(int fd, const void *buf, size_t count) |
|
|
|
|
@@ -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. |
|
|
* |
|
|
* 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. |
|
|
* (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); |
|
|
int restartableDup2(int fd_from, int fd_to); |
|
|