From 0ccd607935a1d910aa54562444f274bcc178535d Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 25 Jun 2018 19:17:50 +0200 Subject: [PATCH] backport: re PR libgomp/84096 (Wrong prototype for omp_init_nest_lock_with_hint() in "omp.h.in") Backported from mainline 2018-01-29 Christoph Spiel Jakub Jelinek PR libgomp/84096 * omp.h.in (omp_init_nest_lock_with_hint): Use omp_nest_lock_t instead of omp_lock_t. From-SVN: r262058 --- libgomp/ChangeLog | 7 +++++++ libgomp/omp.h.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 9671eacd9101..53d06ce117de 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,6 +1,13 @@ 2018-06-25 Jakub Jelinek Backported from mainline + 2018-01-29 Christoph Spiel + Jakub Jelinek + + PR libgomp/84096 + * omp.h.in (omp_init_nest_lock_with_hint): Use omp_nest_lock_t + instead of omp_lock_t. + 2017-11-24 Jakub Jelinek PR fortran/81304 diff --git a/libgomp/omp.h.in b/libgomp/omp.h.in index 30b4338475a5..f2625b2f9f37 100644 --- a/libgomp/omp.h.in +++ b/libgomp/omp.h.in @@ -101,7 +101,7 @@ extern void omp_unset_lock (omp_lock_t *) __GOMP_NOTHROW; extern int omp_test_lock (omp_lock_t *) __GOMP_NOTHROW; extern void omp_init_nest_lock (omp_nest_lock_t *) __GOMP_NOTHROW; -extern void omp_init_nest_lock_with_hint (omp_lock_t *, omp_lock_hint_t) +extern void omp_init_nest_lock_with_hint (omp_nest_lock_t *, omp_lock_hint_t) __GOMP_NOTHROW; extern void omp_destroy_nest_lock (omp_nest_lock_t *) __GOMP_NOTHROW; extern void omp_set_nest_lock (omp_nest_lock_t *) __GOMP_NOTHROW; -- 2.47.2