backport: re PR libgomp/84096 (Wrong prototype for omp_init_nest_lock_with_hint(...

	Backported from mainline
	2018-01-29  Christoph Spiel  <cspiel@freenet.de>
		    Jakub Jelinek  <jakub@redhat.com>

	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

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 9671eacd91014dd0b118f4388ae14183b7f37f19..53d06ce117de5e02319ac886eb0fd3e49e87221c 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,6 +1,13 @@
 2018-06-25  Jakub Jelinek  <jakub@redhat.com>
 
        Backported from mainline
+       2018-01-29  Christoph Spiel  <cspiel@freenet.de>
+                   Jakub Jelinek  <jakub@redhat.com>
+
+       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  <jakub@redhat.com>
 
        PR fortran/81304

diff --git a/libgomp/omp.h.in b/libgomp/omp.h.in
index 30b4338475a55d4b52c2741c71f25bf648a33497..f2625b2f9f370cf731a9ad4008f747d4f9948a76 100644 (file)
--- 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;