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>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-26 17:33:45 +01:00 committed by Marge Bot
parent 522f469fe9
commit b30edf326b
15 changed files with 25 additions and 1 deletions

View File

@ -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 "dix/dix_priv.h"
#include "dix/registry_priv.h"
#include "os/audit.h"
@ -41,7 +44,6 @@ in this Software without prior written authorization from The Open Group.
#include "privates.h"
#include "xacestr.h"
#include "securitysrv.h"
#include <X11/extensions/securproto.h>
#include "extinit.h"
#include "protocol-versions.h"

View File

@ -32,6 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <stdarg.h>
#include <libaudit.h>
#include <X11/Xatom.h>
#include <X11/Xfuncproto.h>
#include "dix/registry_priv.h"

View File

@ -29,6 +29,8 @@
#include "dix-config.h"
#include <X11/Xfuncproto.h>
#include "glamor.h"
#include "xvdix.h"

View File

@ -51,6 +51,8 @@
#ifndef _xf86Xinput_h
#define _xf86Xinput_h
#include <X11/Xfuncproto.h>
#include "xf86.h"
#include "xf86str.h"
#include "inputstr.h"

View File

@ -44,6 +44,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sys/time.h>
#include <unistd.h>
#include <X11/X.h>
#include <X11/Xfuncproto.h>
#include <X11/Xproto.h>
#include "dix/dix_priv.h"

View File

@ -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);

View File

@ -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>

View File

@ -36,6 +36,8 @@
#include <errno.h>
#include <X11/Xlib.h>
#include <X11/Xfuncproto.h>
#include <assert.h>
#include <unistd.h>
#include <stdio.h>

View File

@ -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

View File

@ -35,6 +35,7 @@
#endif
#include <X11/Xatom.h>
#include <X11/Xfuncproto.h>
#include "os/osdep.h"
#include "os/xserver_poll.h"

View File

@ -33,6 +33,7 @@
#include <errno.h>
#include <X11/Xatom.h>
#include <X11/Xfuncproto.h>
#include "dix/dix_priv.h"
#include "dix/screenint_priv.h"

View File

@ -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"

View File

@ -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

View File

@ -85,6 +85,7 @@ OR PERFORMANCE OF THIS SOFTWARE.
#include <stdlib.h> /* for malloc() */
#include <sys/stat.h>
#include <time.h>
#include <X11/Xfuncproto.h>
#include <X11/Xos.h>
#include "dix/dix_priv.h"

View File

@ -37,6 +37,8 @@
#include <dix-config.h>
#endif
#include <X11/Xfuncproto.h>
#include "pseudoramiX.h"
#include "extnsionst.h"
#include "nonsdk_extinit.h"