Skip to content
Permalink
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
cnqpzhang authored and Patrick Zhang committed Feb 4, 2020
1 parent aa3638a commit a59e8a7f6fed2accd1034eebf16545ef78c3ea1b
Showing with 4 additions and 3 deletions.
  1. +2 −1 src/java.base/unix/native/libjava/childproc.c
  2. +2 −2 src/java.base/unix/native/libjava/childproc.h
@@ -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);

0 comments on commit a59e8a7

Please sign in to comment.