libgomp/splay-tree.h: Fix splay_tree_prefix handling

When splay_tree_prefix is defined, the .h file
defines splay_* macros to add the prefix. However,
before those were only unset when additionally
splay_tree_c was defined.
Additionally, for consistency undefine splay_tree_c
also when no splay_tree_prefix is defined - there
is no interdependence either.

libgomp/ChangeLog:

	* splay-tree.h: Fix splay_* macro unsetting if
	splay_tree_prefix is defined.

(cherry picked from commit 6b4e49fdfcc9bff5459d5a821dd7e9476c7c1c10)

diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index 9821d702a320de676ada17b97786f10dad790e10..baa861ccff428bb2500da8ef3dca6501bf8e6538 100644 (file)
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,11 @@
+2022-08-17  Tobias Burnus  <tobias@codesourcery.com>
+
+       Backport from mainline:
+       2022-08-17  Tobias Burnus  <tobias@codesourcery.com>
+
+       * splay-tree.h: Fix splay_* macro unsetting if
+       splay_tree_prefix is defined.
+
 2022-07-29  Tobias Burnus  <tobias@codesourcery.com>
 
        Backport from mainline:

diff --git a/libgomp/splay-tree.h b/libgomp/splay-tree.h
index 8d66dfb51e052442811921993678d68d140e3e37..992381c400025d63ff3ea7d7a1beeb1260f9a0de 100644 (file)
--- a/libgomp/splay-tree.h
+++ b/libgomp/splay-tree.h
@@ -107,24 +107,24 @@ extern void splay_tree_foreach (splay_tree, splay_tree_callback, void *);
 #else  /* splay_tree_c */
 #  ifdef splay_tree_prefix
 #    include "splay-tree.c"
-#    undef splay_tree_name_1
-#    undef splay_tree_name
-#    undef splay_tree_node_s
-#    undef splay_tree_s
-#    undef splay_tree_key_s
-#    undef splay_tree_node
-#    undef splay_tree
-#    undef splay_tree_key
-#    undef splay_compare
-#    undef splay_tree_lookup
-#    undef splay_tree_insert
-#    undef splay_tree_remove
-#    undef splay_tree_foreach
-#    undef splay_tree_callback
-#    undef splay_tree_c
 #  endif
+#  undef splay_tree_c
 #endif /* #ifndef splay_tree_c */
 
 #ifdef splay_tree_prefix
+#  undef splay_tree_name_1
+#  undef splay_tree_name
+#  undef splay_tree_node_s
+#  undef splay_tree_s
+#  undef splay_tree_key_s
+#  undef splay_tree_node
+#  undef splay_tree
+#  undef splay_tree_key
+#  undef splay_compare
+#  undef splay_tree_lookup
+#  undef splay_tree_insert
+#  undef splay_tree_remove
+#  undef splay_tree_foreach
+#  undef splay_tree_callback
 #  undef splay_tree_prefix
 #endif