diff options
| -rw-r--r-- | libgfortran/ChangeLog | 6 | ||||
| -rw-r--r-- | libgfortran/intrinsics/kill.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 2d40ef080cb..1c84d2b9fe2 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,3 +1,9 @@ +2018-03-15 Jakub Jelinek <jakub@redhat.com> + + PR libgfortran/84880 + * intrinsics/kill.c (kill): Rename to... + (PREFIX (kill)): ... this. Use export_proto_np instead of export_proto. + 2018-03-13 Steven G. Kargl <kargl@gcc.gnu.org> * libgfortran/gfortran.map: Remove _gfortran_kill_i4, diff --git a/libgfortran/intrinsics/kill.c b/libgfortran/intrinsics/kill.c index 3b062b3424d..ba24b6fca3b 100644 --- a/libgfortran/intrinsics/kill.c +++ b/libgfortran/intrinsics/kill.c @@ -51,11 +51,11 @@ kill_sub (GFC_INTEGER_4 pid, GFC_INTEGER_4 signal, GFC_INTEGER_4 *status) } iexport(kill_sub); -extern GFC_INTEGER_4 kill (GFC_INTEGER_4, GFC_INTEGER_4); -export_proto(kill); +extern GFC_INTEGER_4 PREFIX (kill) (GFC_INTEGER_4, GFC_INTEGER_4); +export_proto_np(PREFIX (kill)); GFC_INTEGER_4 -kill (GFC_INTEGER_4 pid, GFC_INTEGER_4 signal) +PREFIX (kill) (GFC_INTEGER_4 pid, GFC_INTEGER_4 signal) { int val; val = (int)kill (pid, signal); |