From 4e3489b40a7fadc706b984ac644f6b5242b8e4fa Mon Sep 17 00:00:00 2001
From: Alan Griffiths <alan@octopull.co.uk>
Date: Wed, 23 Oct 2024 11:12:50 +0200
Subject: [PATCH] Consistent and non-conflicting header guards

---
 src/platforms/atomic-kms/server/display_helpers.h           | 6 +++---
 src/platforms/atomic-kms/server/kms/atomic_kms_output.h     | 6 +++---
 src/platforms/atomic-kms/server/kms/bypass.h                | 6 +++---
 src/platforms/atomic-kms/server/kms/display.h               | 6 +++---
 src/platforms/atomic-kms/server/kms/display_sink.h          | 6 +++---
 src/platforms/atomic-kms/server/kms/egl_helper.h            | 6 +++---
 .../atomic-kms/server/kms/kms_display_configuration.h       | 6 +++---
 src/platforms/atomic-kms/server/kms/kms_output.h            | 6 +++---
 src/platforms/atomic-kms/server/kms/kms_output_container.h  | 6 +++---
 src/platforms/atomic-kms/server/kms/kms_page_flipper.h      | 6 +++---
 src/platforms/atomic-kms/server/kms/quirks.h                | 6 +++---
 .../atomic-kms/server/kms/real_kms_display_configuration.h  | 6 +++---
 .../atomic-kms/server/kms/real_kms_output_container.h       | 6 +++---
 13 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/platforms/atomic-kms/server/display_helpers.h b/src/platforms/atomic-kms/server/display_helpers.h
index 6429da51da5..e4cb134e54b 100644
--- a/src/platforms/atomic-kms/server/display_helpers.h
+++ b/src/platforms/atomic-kms/server/display_helpers.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_ATOMIC_DISPLAY_HELPERS_H_
-#define MIR_GRAPHICS_ATOMIC_DISPLAY_HELPERS_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_HELPERS_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_HELPERS_H_
 
 #include "mir/udev/wrapper.h"
 #include "mir/fd.h"
@@ -86,4 +86,4 @@ class GBMHelper
 }
 }
 }
-#endif /* MIR_GRAPHICS_ATOMIC_DISPLAY_HELPERS_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_HELPERS_H_ */
diff --git a/src/platforms/atomic-kms/server/kms/atomic_kms_output.h b/src/platforms/atomic-kms/server/kms/atomic_kms_output.h
index c10a406479c..d67f999ea59 100644
--- a/src/platforms/atomic-kms/server/kms/atomic_kms_output.h
+++ b/src/platforms/atomic-kms/server/kms/atomic_kms_output.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_OUTPUT_H_
-#define MIR_GRAPHICS_GBM_ATOMIC_KMS_OUTPUT_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_ATOMIC_OUTPUT_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_ATOMIC_OUTPUT_H_
 
 #include "kms_output.h"
 #include "kms-utils/drm_mode_resources.h"
@@ -100,4 +100,4 @@ class AtomicKMSOutput : public KMSOutput
 }
 }
 
-#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_OUTPUT_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_ATOMIC_OUTPUT_H_ */
diff --git a/src/platforms/atomic-kms/server/kms/bypass.h b/src/platforms/atomic-kms/server/kms/bypass.h
index 0637ff0c429..0159e268842 100644
--- a/src/platforms/atomic-kms/server/kms/bypass.h
+++ b/src/platforms/atomic-kms/server/kms/bypass.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_GBM_BYPASS_H_
-#define MIR_GRAPHICS_GBM_BYPASS_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_BYPASS_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_BYPASS_H_
 
 #include "mir/graphics/renderable.h"
 
@@ -41,4 +41,4 @@ class BypassMatch
 } // namespace graphics
 } // namespace mir
 
-#endif // MIR_GRAPHICS_GBM_BYPASS_H_
+#endif // MIR_GRAPHICS_GBM_ATOMIC_KMS_BYPASS_H_
diff --git a/src/platforms/atomic-kms/server/kms/display.h b/src/platforms/atomic-kms/server/kms/display.h
index ba0961a0606..d99fb417dc7 100644
--- a/src/platforms/atomic-kms/server/kms/display.h
+++ b/src/platforms/atomic-kms/server/kms/display.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_GBM_DISPLAY_H_
-#define MIR_GRAPHICS_GBM_DISPLAY_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_H_
 
 #include "kms-utils/drm_event_handler.h"
 #include "mir/graphics/display.h"
@@ -128,4 +128,4 @@ class GBMDisplayProvider : public graphics::GBMDisplayProvider
 }
 }
 
-#endif /* MIR_GRAPHICS_GBM_DISPLAY_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_H_ */
diff --git a/src/platforms/atomic-kms/server/kms/display_sink.h b/src/platforms/atomic-kms/server/kms/display_sink.h
index 359637c1164..01dc0a08761 100644
--- a/src/platforms/atomic-kms/server/kms/display_sink.h
+++ b/src/platforms/atomic-kms/server/kms/display_sink.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_ATOMIC_DISPLAY_SINK_H_
-#define MIR_GRAPHICS_ATOMIC_DISPLAY_SINK_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_SINK_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_SINK_H_
 
 #include "kms-utils/drm_event_handler.h"
 #include "mir/graphics/display_sink.h"
@@ -123,4 +123,4 @@ class DisplaySink : public graphics::DisplaySink,
 }
 }
 
-#endif /* MIR_GRAPHICS_ATOMIC_DISPLAY_SINK_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_SINK_H_ */
diff --git a/src/platforms/atomic-kms/server/kms/egl_helper.h b/src/platforms/atomic-kms/server/kms/egl_helper.h
index ea4468fbd80..4c55f9057a3 100644
--- a/src/platforms/atomic-kms/server/kms/egl_helper.h
+++ b/src/platforms/atomic-kms/server/kms/egl_helper.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_GBM_EGL_HELPER_H_
-#define MIR_GRAPHICS_GBM_EGL_HELPER_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_EGL_HELPER_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_EGL_HELPER_H_
 
 #include "../display_helpers.h"
 #include "mir/graphics/egl_extensions.h"
@@ -84,4 +84,4 @@ class EGLHelper
 }
 }
 
-#endif /* MIR_GRAPHICS_GBM_EGL_HELPER_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_EGL_HELPER_H_ */
diff --git a/src/platforms/atomic-kms/server/kms/kms_display_configuration.h b/src/platforms/atomic-kms/server/kms/kms_display_configuration.h
index 03ead845579..a0c42b8a913 100644
--- a/src/platforms/atomic-kms/server/kms/kms_display_configuration.h
+++ b/src/platforms/atomic-kms/server/kms/kms_display_configuration.h
@@ -14,8 +14,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_GBM_KMS_DISPLAY_CONFIGURATION_H_
-#define MIR_GRAPHICS_GBM_KMS_DISPLAY_CONFIGURATION_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_CONFIGURATION_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_CONFIGURATION_H_
 
 #include "mir/graphics/display_configuration.h"
 #include <memory>
@@ -44,4 +44,4 @@ class KMSDisplayConfiguration : public DisplayConfiguration
 }
 }
 
-#endif /* MIR_GRAPHICS_GBM_KMS_DISPLAY_CONFIGURATION_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_DISPLAY_CONFIGURATION_H_ */
diff --git a/src/platforms/atomic-kms/server/kms/kms_output.h b/src/platforms/atomic-kms/server/kms/kms_output.h
index 6772556d240..aee367f93b6 100644
--- a/src/platforms/atomic-kms/server/kms/kms_output.h
+++ b/src/platforms/atomic-kms/server/kms/kms_output.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_GBM_KMS_OUTPUT_H_
-#define MIR_GRAPHICS_GBM_KMS_OUTPUT_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_OUTPUT_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_OUTPUT_H_
 
 #include "mir/geometry/size.h"
 #include "mir/geometry/point.h"
@@ -106,4 +106,4 @@ class KMSOutput
 }
 }
 
-#endif /* MIR_GRAPHICS_GBM_KMS_OUTPUT_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_OUTPUT_H_ */
diff --git a/src/platforms/atomic-kms/server/kms/kms_output_container.h b/src/platforms/atomic-kms/server/kms/kms_output_container.h
index 2d951cb56ab..3365d2df21b 100644
--- a/src/platforms/atomic-kms/server/kms/kms_output_container.h
+++ b/src/platforms/atomic-kms/server/kms/kms_output_container.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_GBM_KMS_OUTPUT_CONTAINER_H_
-#define MIR_GRAPHICS_GBM_KMS_OUTPUT_CONTAINER_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_OUTPUT_CONTAINER_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_OUTPUT_CONTAINER_H_
 
 #include <memory>
 #include <functional>
@@ -50,4 +50,4 @@ class KMSOutputContainer
 }
 }
 
-#endif /* MIR_GRAPHICS_GBM_KMS_OUTPUT_CONTAINER_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_OUTPUT_CONTAINER_H_ */
diff --git a/src/platforms/atomic-kms/server/kms/kms_page_flipper.h b/src/platforms/atomic-kms/server/kms/kms_page_flipper.h
index 4cd287ab6f3..048dccd5079 100644
--- a/src/platforms/atomic-kms/server/kms/kms_page_flipper.h
+++ b/src/platforms/atomic-kms/server/kms/kms_page_flipper.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_GBM_KMS_PAGE_FLIPPER_H_
-#define MIR_GRAPHICS_GBM_KMS_PAGE_FLIPPER_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_PAGE_FLIPPER_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_PAGE_FLIPPER_H_
 
 #include "page_flipper.h"
 
@@ -73,4 +73,4 @@ class KMSPageFlipper : public PageFlipper
 }
 }
 
-#endif /* MIR_GRAPHICS_GBM_KMS_PAGE_FLIPPER_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_PAGE_FLIPPER_H_ */
diff --git a/src/platforms/atomic-kms/server/kms/quirks.h b/src/platforms/atomic-kms/server/kms/quirks.h
index 0e3427c4d72..6bd592b1bd9 100644
--- a/src/platforms/atomic-kms/server/kms/quirks.h
+++ b/src/platforms/atomic-kms/server/kms/quirks.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_GBM_KMS_QUIRKS_H_
-#define MIR_GRAPHICS_GBM_KMS_QUIRKS_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_QUIRKS_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_QUIRKS_H_
 
 #include <memory>
 #include <boost/program_options.hpp>
@@ -64,4 +64,4 @@ class Quirks
 }
 
 
-#endif //MIR_GRAPHICS_GBM_KMS_QUIRKS_H_
+#endif //MIR_GRAPHICS_GBM_ATOMIC_KMS_QUIRKS_H_
diff --git a/src/platforms/atomic-kms/server/kms/real_kms_display_configuration.h b/src/platforms/atomic-kms/server/kms/real_kms_display_configuration.h
index b58c37d5c26..b4967a1d988 100644
--- a/src/platforms/atomic-kms/server/kms/real_kms_display_configuration.h
+++ b/src/platforms/atomic-kms/server/kms/real_kms_display_configuration.h
@@ -14,8 +14,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_ATOMIC_REAL_KMS_DISPLAY_CONFIGURATION_H_
-#define MIR_GRAPHICS_ATOMIC_REAL_KMS_DISPLAY_CONFIGURATION_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_REALDISPLAY_CONFIGURATION_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_REALDISPLAY_CONFIGURATION_H_
 
 #include "kms_display_configuration.h"
 
@@ -62,4 +62,4 @@ bool compatible(RealKMSDisplayConfiguration const& conf1, RealKMSDisplayConfigur
 }
 }
 
-#endif /* MIR_GRAPHICS_ATOMIC_REAL_KMS_DISPLAY_CONFIGURATION_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_REALDISPLAY_CONFIGURATION_H_ */
diff --git a/src/platforms/atomic-kms/server/kms/real_kms_output_container.h b/src/platforms/atomic-kms/server/kms/real_kms_output_container.h
index 97641bd876e..b6a6d67e15f 100644
--- a/src/platforms/atomic-kms/server/kms/real_kms_output_container.h
+++ b/src/platforms/atomic-kms/server/kms/real_kms_output_container.h
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MIR_GRAPHICS_GBM_REAL_KMS_OUTPUT_CONTAINER_H_
-#define MIR_GRAPHICS_GBM_REAL_KMS_OUTPUT_CONTAINER_H_
+#ifndef MIR_GRAPHICS_GBM_ATOMIC_KMS_REAL_OUTPUT_CONTAINER_H_
+#define MIR_GRAPHICS_GBM_ATOMIC_KMS_REAL_OUTPUT_CONTAINER_H_
 
 #include "kms_output_container.h"
 #include "mir/fd.h"
@@ -51,4 +51,4 @@ class RealKMSOutputContainer : public KMSOutputContainer
 }
 }
 
-#endif /* MIR_GRAPHICS_GBM_REAL_KMS_OUTPUT_CONTAINER_H_ */
+#endif /* MIR_GRAPHICS_GBM_ATOMIC_KMS_REAL_OUTPUT_CONTAINER_H_ */