Rename SEARCH_ALL

The constant SEARCH_ALL conflicts with a define in a Windows header.
This patch renames the constant to SEARCH_ALL_DOMAINS to avoid the
conflict.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31307

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index f1d01ec7aa3731eb5e9e36358d7a2304a7a73fa1..52bae581af65d10eab27a16d935ac1163ec10e7f 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -13533,7 +13533,7 @@ public:
                             NULL,
                             NULL,
                             SEARCH_GLOBAL_BLOCK | SEARCH_STATIC_BLOCK,
-                            SEARCH_ALL);
+                            SEARCH_ALL_DOMAINS);
 
     /* At this point scan through the misc symbol vectors and add each
        symbol you find to the list.  Eventually we want to ignore

diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c
index 9d8e801ba3a342fb4f9a27eac8ef0490259fec05..c4355b83c7fda057d0dd27ca93970bd016a9a5fb 100644 (file)
--- a/gdb/compile/compile-cplus-symbols.c
+++ b/gdb/compile/compile-cplus-symbols.c
@@ -368,7 +368,7 @@ gcc_cplus_convert_symbol (void *datum,
 
       symbol_searcher searcher;
       searcher.find_all_symbols (identifier, current_language,
-                                SEARCH_ALL, nullptr, nullptr);
+                                SEARCH_ALL_DOMAINS, nullptr, nullptr);
 
       /* Convert any found symbols.  */
       for (const auto &it : searcher.matching_symbols ())

diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c
index 1ebdf028a3498e3ad2675f24c0bd9c66abbcc996..88da56527e833c8a02958d07b02ffb8332f74d99 100644 (file)
--- a/gdb/python/py-symbol.c
+++ b/gdb/python/py-symbol.c
@@ -600,7 +600,7 @@ gdbpy_lookup_static_symbols (PyObject *self, PyObject *args, PyObject *kw)
       lookup_name_info lookup_name (name, symbol_name_match_type::FULL);
       expand_symtabs_matching (NULL, lookup_name, NULL, NULL,
                               SEARCH_GLOBAL_BLOCK | SEARCH_STATIC_BLOCK,
-                              SEARCH_ALL);
+                              SEARCH_ALL_DOMAINS);
 
       for (objfile *objfile : current_program_space->objfiles ())
        {

diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c
index 96cdfeeb7ed23c6ac1b5d78714e62452f960f7d2..36719fccabe443549ccaed61c0704f5157aaff6c 100644 (file)
--- a/gdb/symfile-debug.c
+++ b/gdb/symfile-debug.c
@@ -222,7 +222,7 @@ objfile::map_symtabs_matching_filename
                                          on_expansion,
                                          (SEARCH_GLOBAL_BLOCK
                                           | SEARCH_STATIC_BLOCK),
-                                         SEARCH_ALL))
+                                         SEARCH_ALL_DOMAINS))
        {
          retval = false;
          break;
@@ -378,7 +378,7 @@ objfile::expand_symtabs_with_fullname (const char *fullname)
                                   nullptr,
                                   (SEARCH_GLOBAL_BLOCK
                                    | SEARCH_STATIC_BLOCK),
-                                  SEARCH_ALL);
+                                  SEARCH_ALL_DOMAINS);
 }
 
 bool

diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 3659ac687b0e08546382747d218f6b9a2171e045..49b9674f77adc6c6e87cae4e700da555dc3be1eb 100644 (file)
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -919,7 +919,7 @@ maintenance_expand_symtabs (const char *args, int from_tty)
         NULL,
         NULL,
         SEARCH_GLOBAL_BLOCK | SEARCH_STATIC_BLOCK,
-        SEARCH_ALL);
+        SEARCH_ALL_DOMAINS);
 }
 \f
 

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 5221989e6f4f19eabd82344b88cb367f9f2b13de..32b19e6c902315eec575ef9b11208b4b6bab3151 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -5993,7 +5993,7 @@ default_collect_symbol_completion_matches_break_on
                               return true;
                             },
                           SEARCH_GLOBAL_BLOCK | SEARCH_STATIC_BLOCK,
-                          SEARCH_ALL);
+                          SEARCH_ALL_DOMAINS);
 
   /* Search upwards from currently selected frame (so that we can
      complete on local vars).  Also catch fields of types defined in

diff --git a/gdb/symtab.h b/gdb/symtab.h
index d43207ed70a65d9b824815027e44c2ffa7844ea4..3b067a77b3c873a372fabc79c4ce3ad3e3df8df4 100644 (file)
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -917,7 +917,7 @@ enum domain_search_flag
 DEF_ENUM_FLAGS_TYPE (enum domain_search_flag, domain_search_flags);
 
 /* A convenience constant to search for any symbol.  */
-constexpr domain_search_flags SEARCH_ALL
+constexpr domain_search_flags SEARCH_ALL_DOMAINS
     = ((domain_search_flags) 0
 #define SYM_DOMAIN(X) | SEARCH_ ## X ## _DOMAIN
 #include "sym-domains.def"
@@ -958,7 +958,7 @@ search_flags_matches (domain_search_flags flags, domain_enum domain)
 
 /* The flag bit.  */
 constexpr int SCRIPTING_SEARCH_FLAG = 0x8000;
-static_assert (SCRIPTING_SEARCH_FLAG > SEARCH_ALL);
+static_assert (SCRIPTING_SEARCH_FLAG > SEARCH_ALL_DOMAINS);
 
 /* Convert a domain constant to a "scripting domain".  */
 static constexpr inline int