From 1ed382ec1ac5da19507193fea74b52941531bcba Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@mikedld.com>
Date: Mon, 23 Jun 2025 22:43:05 +0100
Subject: [PATCH] xfixes: move include guards up to wrap the whole file

See: https://gcc.gnu.org/onlinedocs/cppinternals/Guard-Macros.html
Signed-off-by: Mike Gelfand <mikedld@mikedld.com>
---
 xfixes/xfixes.h    | 6 +++---
 xfixes/xfixesint.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h
index 23f31cde4..31f0e1316 100644
--- a/xfixes/xfixes.h
+++ b/xfixes/xfixes.h
@@ -20,13 +20,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef _XFIXES_H_
+#define _XFIXES_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _XFIXES_H_
-#define _XFIXES_H_
-
 #include "resource.h"
 
 extern RESTYPE RegionResType;
diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index 6e606d00a..0f6e87931 100644
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -42,13 +42,13 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifndef _XFIXESINT_H_
+#define _XFIXESINT_H_
+
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
 #endif
 
-#ifndef _XFIXESINT_H_
-#define _XFIXESINT_H_
-
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/extensions/xfixesproto.h>