No functional change intended.
gcc/ChangeLog:
* common.opt: Update for move of diagnostic-url.h to
diagnostics/url.h.
* diagnostic.cc: Likewise.
* diagnostics/color.cc: Likewise.
* diagnostics/text-sink.cc: Likewise.
* diagnostic-url.h: Move to...
* diagnostics/url.h: ...here.
* libgdiagnostics.cc: Update for move of diagnostic-url.h to
diagnostics/url.h.
* pretty-print.h: Likewise.
---
gcc/common.opt | 2 +-
gcc/diagnostic.cc | 2 +-
gcc/diagnostics/color.cc | 2 +-
gcc/diagnostics/text-sink.cc | 2 +-
gcc/{diagnostic-url.h => diagnostics/url.h} | 6 +++---
gcc/libgdiagnostics.cc | 2 +-
gcc/pretty-print.h | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
rename gcc/{diagnostic-url.h => diagnostics/url.h} (93%)
diff --git a/gcc/common.opt b/gcc/common.opt
index 0c9d01019128..70659fabebd5 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -1471,7 +1471,7 @@ Driver Common Joined RejectNegative
Var(flag_diagnostics_show_urls) Enum(diagnos
; Required for these enum values.
SourceInclude
-diagnostic-url.h
+diagnostics/url.h
Enum
Name(diagnostic_url_rule) Type(int)
diff --git a/gcc/diagnostic.cc b/gcc/diagnostic.cc
index c6e5523b974a..74a3a0b0af4f 100644
--- a/gcc/diagnostic.cc
+++ b/gcc/diagnostic.cc
@@ -32,7 +32,7 @@ along with GCC; see the file COPYING3. If not see
#include "backtrace.h"
#include "diagnostic.h"
#include "diagnostics/color.h"
-#include "diagnostic-url.h"
+#include "diagnostics/url.h"
#include "diagnostics/metadata.h"
#include "diagnostics/paths.h"
#include "diagnostics/client-data-hooks.h"
diff --git a/gcc/diagnostics/color.cc b/gcc/diagnostics/color.cc
index 68a50f2e5001..622027b4c0e1 100644
--- a/gcc/diagnostics/color.cc
+++ b/gcc/diagnostics/color.cc
@@ -20,7 +20,7 @@
#define INCLUDE_VECTOR
#include "system.h"
#include "diagnostics/color.h"
-#include "diagnostic-url.h"
+#include "diagnostics/url.h"
#include "label-text.h"
#ifdef __MINGW32__
diff --git a/gcc/diagnostics/text-sink.cc b/gcc/diagnostics/text-sink.cc
index a602e23f7d1a..6fdbf22308f0 100644
--- a/gcc/diagnostics/text-sink.cc
+++ b/gcc/diagnostics/text-sink.cc
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "diagnostic.h"
#include "diagnostics/color.h"
-#include "diagnostic-url.h"
+#include "diagnostics/url.h"
#include "diagnostics/metadata.h"
#include "diagnostics/paths.h"
#include "diagnostics/client-data-hooks.h"
diff --git a/gcc/diagnostic-url.h b/gcc/diagnostics/url.h
similarity index 93%
rename from gcc/diagnostic-url.h
rename to gcc/diagnostics/url.h
index d54775b79bd6..89efa362d5d0 100644
--- a/gcc/diagnostic-url.h
+++ b/gcc/diagnostics/url.h
@@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public
License
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#ifndef GCC_DIAGNOSTIC_URL_H
-#define GCC_DIAGNOSTIC_URL_H
+#ifndef GCC_DIAGNOSTICS_URL_H
+#define GCC_DIAGNOSTICS_URL_H
/* Whether to add URLs to diagnostics:
- DIAGNOSTICS_URL_NO: never
@@ -49,4 +49,4 @@ const diagnostic_url_format URL_FORMAT_DEFAULT =
URL_FORMAT_BEL;
extern diagnostic_url_format determine_url_format (diagnostic_url_rule_t);
-#endif /* ! GCC_DIAGNOSTIC_URL_H */
+#endif /* ! GCC_DIAGNOSTICS_URL_H */
diff --git a/gcc/libgdiagnostics.cc b/gcc/libgdiagnostics.cc
index 868f9db731f1..0bd4b1263f6a 100644
--- a/gcc/libgdiagnostics.cc
+++ b/gcc/libgdiagnostics.cc
@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3. If not see
#include "intl.h"
#include "diagnostic.h"
#include "diagnostics/color.h"
-#include "diagnostic-url.h"
+#include "diagnostics/url.h"
#include "diagnostics/metadata.h"
#include "diagnostics/paths.h"
#include "diagnostics/client-data-hooks.h"
diff --git a/gcc/pretty-print.h b/gcc/pretty-print.h
index 6cd9150a9d08..ced2e3cec47b 100644
--- a/gcc/pretty-print.h
+++ b/gcc/pretty-print.h
@@ -23,7 +23,7 @@ along with GCC; see the file COPYING3. If not see
#include "obstack.h"
#include "rich-location.h"
-#include "diagnostic-url.h"
+#include "diagnostics/url.h"
/* Maximum number of format string arguments. */
#define PP_NL_ARGMAX 30
--
2.26.3
