From 8cde76988b8758ea2efae756dc588335552cee36 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 26 Feb 2024 17:33:45 +0100
Subject: [PATCH] fix missing includes of <X11/Xfuncproto.h>

Several places using _X_ATTRIBUTE_PRINTF macro from X11/Xfuncproto.h
but missing to include it, so it depends on other headers whether it's
included by mere accident, which quickly causes trouble if include order
changes. Cleaning that up by adding explicit include statements.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1580>
(cherry picked from commit b30edf326b1e3e0798d7e1be7978cdf5432ae99b)
---
 Xext/security.c                       | 4 +++-
 Xext/xselinux_hooks.c                 | 2 ++
 glamor/glamor_priv.h                  | 2 ++
 hw/xfree86/common/xf86Xinput.h        | 2 ++
 hw/xfree86/dri/dri.c                  | 1 +
 hw/xfree86/parser/configProcs.h       | 2 ++
 hw/xquartz/darwin.h                   | 2 ++
 hw/xquartz/mach-startup/bundle-main.c | 2 ++
 hw/xquartz/pbproxy/pbproxy.h          | 1 +
 hw/xwayland/xwayland-screen.c         | 1 +
 hw/xwayland/xwayland.c                | 1 +
 hw/xwin/win.h                         | 2 ++
 include/os.h                          | 2 ++
 os/log.c                              | 9 +++++----
 pseudoramiX/pseudoramiX.c             | 2 ++
 15 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Xext/security.c b/Xext/security.c
index fb803f996..6bf34f9d9 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -28,6 +28,9 @@ in this Software without prior written authorization from The Open Group.
 #include <dix-config.h>
 #endif
 
+#include <X11/extensions/securproto.h>
+#include <X11/Xfuncproto.h>
+
 #include "scrnintstr.h"
 #include "inputstr.h"
 #include "windowstr.h"
@@ -37,7 +40,6 @@ in this Software without prior written authorization from The Open Group.
 #include "registry.h"
 #include "xacestr.h"
 #include "securitysrv.h"
-#include <X11/extensions/securproto.h>
 #include "extinit.h"
 #include "protocol-versions.h"
 
diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index f7b5267ac..266b0972e 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -34,6 +34,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <libaudit.h>
 
 #include <X11/Xatom.h>
+#include <X11/Xfuncproto.h>
+
 #include "selection.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index 5a0dc2e2d..f80aab74b 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -29,6 +29,8 @@
 
 #include "dix-config.h"
 
+#include <X11/Xfuncproto.h>
+
 #include "glamor.h"
 #include "xvdix.h"
 
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index e73aff269..6c4eaede1 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -51,6 +51,8 @@
 #ifndef _xf86Xinput_h
 #define _xf86Xinput_h
 
+#include <X11/Xfuncproto.h>
+
 #include "xf86.h"
 #include "xf86str.h"
 #include "inputstr.h"
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index a532dba8d..d57fb3a6e 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -46,6 +46,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <errno.h>
 
 #include <X11/X.h>
+#include <X11/Xfuncproto.h>
 #include <X11/Xproto.h>
 #include "xf86drm.h"
 #include "misc.h"
diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
index 7a46e0160..39399b7bc 100644
--- a/hw/xfree86/parser/configProcs.h
+++ b/hw/xfree86/parser/configProcs.h
@@ -29,6 +29,8 @@
 
 /* exported functions are/were used by the X Server */
 
+#include <X11/Xfuncproto.h>
+
 /* Device.c */
 XF86ConfDevicePtr xf86parseDeviceSection(void);
 void xf86printDeviceSection(FILE * cf, XF86ConfDevicePtr ptr);
diff --git a/hw/xquartz/darwin.h b/hw/xquartz/darwin.h
index 3cae50b2a..c434d4838 100644
--- a/hw/xquartz/darwin.h
+++ b/hw/xquartz/darwin.h
@@ -29,6 +29,8 @@
 #define _DARWIN_H
 
 #include <IOKit/IOTypes.h>
+#include <X11/Xfuncproto.h>
+
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include <X11/extensions/XKB.h>
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 5c5bc70ac..a2c18e1e1 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -36,6 +36,8 @@
 
 #include <errno.h>
 #include <X11/Xlib.h>
+#include <X11/Xfuncproto.h>
+
 #include <assert.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/hw/xquartz/pbproxy/pbproxy.h b/hw/xquartz/pbproxy/pbproxy.h
index 482f95ea6..ae3a8d34e 100644
--- a/hw/xquartz/pbproxy/pbproxy.h
+++ b/hw/xquartz/pbproxy/pbproxy.h
@@ -37,6 +37,7 @@
 
 #define  Cursor X_Cursor
 #undef _SHAPE_H_
+#include <X11/Xfuncproto.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>
 #undef   Cursor
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index d9ac9342f..d51e39510 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -35,6 +35,7 @@
 #endif
 
 #include <X11/Xatom.h>
+#include <X11/Xfuncproto.h>
 
 #include "os/xserver_poll.h"
 
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index e28113e4b..98f524d6e 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 
 #include <X11/Xatom.h>
+#include <X11/Xfuncproto.h>
 
 #include "os/xserver_poll.h"
 
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index 62954e675..6fff4cf54 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -139,9 +139,11 @@
 #endif                          /* HAVE_MMAP */
 
 #include <X11/X.h>
+#include <X11/Xfuncproto.h>
 #include <X11/Xproto.h>
 #include <X11/Xos.h>
 #include <X11/Xprotostr.h>
+
 #include "scrnintstr.h"
 #include "pixmapstr.h"
 #include "pixmap.h"
diff --git a/include/os.h b/include/os.h
index a69f127c1..1b0f21e2b 100644
--- a/include/os.h
+++ b/include/os.h
@@ -58,6 +58,8 @@ SOFTWARE.
 #include <time.h>
 #endif
 
+#include <X11/Xfuncproto.h>
+
 #define SCREEN_SAVER_ON   0
 #define SCREEN_SAVER_OFF  1
 #define SCREEN_SAVER_FORCER 2
diff --git a/os/log.c b/os/log.c
index e15823046..78300bca5 100644
--- a/os/log.c
+++ b/os/log.c
@@ -79,13 +79,14 @@ OR PERFORMANCE OF THIS SOFTWARE.
 #include <dix-config.h>
 #endif
 
-#include <X11/Xos.h>
+#include <errno.h>
 #include <stdio.h>
-#include <time.h>
-#include <sys/stat.h>
 #include <stdarg.h>
 #include <stdlib.h>             /* for malloc() */
-#include <errno.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <X11/Xfuncproto.h>
+#include <X11/Xos.h>
 
 #include "input.h"
 #include "opaque.h"
diff --git a/pseudoramiX/pseudoramiX.c b/pseudoramiX/pseudoramiX.c
index 95f6e10c8..5e56fb696 100644
--- a/pseudoramiX/pseudoramiX.c
+++ b/pseudoramiX/pseudoramiX.c
@@ -37,6 +37,8 @@
 #include <dix-config.h>
 #endif
 
+#include <X11/Xfuncproto.h>
+
 #include "pseudoramiX.h"
 #include "extnsionst.h"
 #include "nonsdk_extinit.h"