re PR target/80090 (Incorrect assembler - output_addr_const may generate visibility...

[gcc.git] / libgomp / splay-tree.h

diff --git a/libgomp/splay-tree.h b/libgomp/splay-tree.h
index 085021cf3d642b6a0987e4d9080b55af149f6ce0..0292d2803ed5b2de6f289a0eb2b25affc80c9e8e 100644 (file)
--- a/libgomp/splay-tree.h
+++ b/libgomp/splay-tree.h
@@ -1,5 +1,5 @@
 /* A splay-tree datatype.
-   Copyright (C) 1998-2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2017 Free Software Foundation, Inc.
    Contributed by Mark Mitchell (mark@markmitchell.com).
 
    This file is part of the GNU Offloading and Multi Processing Library
@@ -33,7 +33,17 @@ typedef struct splay_tree_node_s *splay_tree_node;
 typedef struct splay_tree_s *splay_tree;
 typedef struct splay_tree_key_s *splay_tree_key;
    define splay_tree_key_s structure, and define
-   splay_compare inline function.  */
+   splay_compare inline function.
+
+   Alternatively, they can define splay_tree_prefix macro before
+   including this header and then all the above types, the
+   splay_compare function and the splay_tree_{lookup,insert_remove}
+   function will be prefixed by that prefix.  If splay_tree_prefix
+   macro is defined, this header must be included twice: once where
+   you need the header file definitions, and once where you need the
+   .c implementation routines.  In the latter case, you must also
+   define the macro splay_tree_c.  See the include of splay-tree.h in
+   priority_queue.[hc] for an example.  */
 
 /* For an easily readable description of splay-trees, see:
 
@@ -43,8 +53,37 @@ typedef struct splay_tree_key_s *splay_tree_key;
    The major feature of splay trees is that all basic tree operations
    are amortized O(log n) time for a tree with n nodes.  */
 
-#ifndef _SPLAY_TREE_H
-#define _SPLAY_TREE_H 1
+#ifdef splay_tree_prefix
+# define splay_tree_name_1(prefix, name) prefix ## _ ## name
+# define splay_tree_name(prefix, name) splay_tree_name_1 (prefix, name)
+# define splay_tree_node_s     \
+    splay_tree_name (splay_tree_prefix, splay_tree_node_s)
+# define splay_tree_s          \
+    splay_tree_name (splay_tree_prefix, splay_tree_s)
+# define splay_tree_key_s      \
+    splay_tree_name (splay_tree_prefix, splay_tree_key_s)
+# define splay_tree_node       \
+    splay_tree_name (splay_tree_prefix, splay_tree_node)
+# define splay_tree            \
+    splay_tree_name (splay_tree_prefix, splay_tree)
+# define splay_tree_key                \
+    splay_tree_name (splay_tree_prefix, splay_tree_key)
+# define splay_compare         \
+    splay_tree_name (splay_tree_prefix, splay_compare)
+# define splay_tree_lookup     \
+    splay_tree_name (splay_tree_prefix, splay_tree_lookup)
+# define splay_tree_insert     \
+    splay_tree_name (splay_tree_prefix, splay_tree_insert)
+# define splay_tree_remove     \
+    splay_tree_name (splay_tree_prefix, splay_tree_remove)
+# define splay_tree_foreach    \
+    splay_tree_name (splay_tree_prefix, splay_tree_foreach)
+# define splay_tree_callback   \
+    splay_tree_name (splay_tree_prefix, splay_tree_callback)
+#endif
+
+#ifndef splay_tree_c
+/* Header file definitions and prototypes.  */
 
 /* The nodes in the splay tree.  */
 struct splay_tree_node_s {
@@ -59,8 +98,33 @@ struct splay_tree_s {
   splay_tree_node root;
 };
 
+typedef void (*splay_tree_callback) (splay_tree_key, void *);
+
 extern splay_tree_key splay_tree_lookup (splay_tree, splay_tree_key);
 extern void splay_tree_insert (splay_tree, splay_tree_node);
 extern void splay_tree_remove (splay_tree, splay_tree_key);
+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
+#endif /* #ifndef splay_tree_c */
 
-#endif /* _SPLAY_TREE_H */
+#ifdef splay_tree_prefix
+#  undef splay_tree_prefix
+#endif