xserver: Branch 'master'

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Mar 18 23:01:58 UTC 2024 

 Xext/xselinux_hooks.c                     |    1 +
 hw/xfree86/common/xf86Configure.c         |    2 ++
 hw/xfree86/common/xf86Events.c            |    2 ++
 hw/xfree86/drivers/modesetting/dri2.c     |    2 ++
 hw/xfree86/drivers/modesetting/driver.c   |    2 ++
 hw/xfree86/drivers/modesetting/pageflip.c |    2 ++
 hw/xfree86/drivers/modesetting/vblank.c   |    2 ++
 hw/xfree86/int10/generic.c                |    1 +
 hw/xfree86/os-support/bsd/alpha_video.c   |    2 ++
 hw/xfree86/os-support/bsd/arm_video.c     |    2 ++
 hw/xfree86/os-support/hurd/hurd_video.c   |    3 ++-
 hw/xfree86/os-support/linux/lnx_agp.c     |    2 ++
 hw/xfree86/os-support/linux/lnx_init.c    |    1 +
 hw/xfree86/os-support/shared/posix_tty.c  |    2 ++
 hw/xfree86/os-support/shared/sigio.c      |    2 ++
 hw/xfree86/os-support/solaris/sun_agp.c   |    2 ++
 hw/xfree86/os-support/solaris/sun_apm.c   |    2 ++
 hw/xfree86/os-support/solaris/sun_bell.c  |    1 +
 hw/xfree86/os-support/solaris/sun_init.c  |    2 ++
 hw/xfree86/os-support/xf86_OSlib.h        |    6 ------
 hw/xquartz/applewm.c                      |    2 ++
 hw/xquartz/mach-startup/bundle-main.c     |    1 +
 hw/xwayland/xwayland-xtest.c              |    1 +
 os/xdmcp.c                                |    1 +
 24 files changed, 39 insertions(+), 7 deletions(-)

New commits:
commit f6a367102cbb4ab8b8d56b1943a06cc07462cd81
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Mon Mar 18 15:11:08 2024 +0100

    Fix missing includes of <errno.h>
    
    It's much cleaner to always include directly what one needs,
    instead of relying on very indirect including.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1416>

diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index 55fd54a5b..d0ddf22e6 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -26,6 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <errno.h>
 #include <sys/socket.h>
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c
index 4347f6d2f..52594c692 100644
--- a/hw/xfree86/common/xf86Configure.c
+++ b/hw/xfree86/common/xf86Configure.c
@@ -27,6 +27,8 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
+
 #include "xf86.h"
 #include "xf86Config.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 404c37e46..6a349f4c6 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -53,9 +53,11 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
+
 #include "misc.h"
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/drivers/modesetting/dri2.c b/hw/xfree86/drivers/modesetting/dri2.c
index 34ddec424..f2094a910 100644
--- a/hw/xfree86/drivers/modesetting/dri2.c
+++ b/hw/xfree86/drivers/modesetting/dri2.c
@@ -36,7 +36,9 @@
 #include "dix-config.h"
 #endif
 
+#include <errno.h>
 #include <time.h>
+
 #include "list.h"
 #include "xf86.h"
 #include "driver.h"
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index cf2d4cfe4..b33091cdc 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -36,8 +36,10 @@
 #include "dix-config.h"
 #endif
 
+#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSproc.h"
diff --git a/hw/xfree86/drivers/modesetting/pageflip.c b/hw/xfree86/drivers/modesetting/pageflip.c
index f6903adb2..f0b8d5919 100644
--- a/hw/xfree86/drivers/modesetting/pageflip.c
+++ b/hw/xfree86/drivers/modesetting/pageflip.c
@@ -24,6 +24,8 @@
 #include "dix-config.h"
 #endif
 
+#include <errno.h>
+
 #include <xserver_poll.h>
 #include <xf86drm.h>
 
diff --git a/hw/xfree86/drivers/modesetting/vblank.c b/hw/xfree86/drivers/modesetting/vblank.c
index c7aeb9f16..c89aa3f17 100644
--- a/hw/xfree86/drivers/modesetting/vblank.c
+++ b/hw/xfree86/drivers/modesetting/vblank.c
@@ -29,7 +29,9 @@
 #include "dix-config.h"
 #endif
 
+#include <errno.h>
 #include <unistd.h>
+
 #include <xf86.h>
 #include <xf86Crtc.h>
 #include "driver.h"
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 850663b73..9e52305d9 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -7,6 +7,7 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c
index b4038bd2b..721c09af8 100644
--- a/hw/xfree86/os-support/bsd/alpha_video.c
+++ b/hw/xfree86/os-support/bsd/alpha_video.c
@@ -27,7 +27,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <X11/X.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 
diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c
index 180d70543..587b9d3ac 100644
--- a/hw/xfree86/os-support/bsd/arm_video.c
+++ b/hw/xfree86/os-support/bsd/arm_video.c
@@ -60,7 +60,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <X11/X.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
index ac24f1950..63f3aef71 100644
--- a/hw/xfree86/os-support/hurd/hurd_video.c
+++ b/hw/xfree86/os-support/hurd/hurd_video.c
@@ -29,8 +29,9 @@
 #include <device/device.h>
 #include <mach/machine/mach_i386.h>
 #include <hurd.h>
-
+#include <errno.h>
 #include <X11/X.h>
+
 #include "input.h"
 #include "scrnintstr.h"
 
diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c
index 3aec5397c..58c904afb 100644
--- a/hw/xfree86/os-support/linux/lnx_agp.c
+++ b/hw/xfree86/os-support/linux/lnx_agp.c
@@ -11,7 +11,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <X11/X.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c
index 4ea791a89..b3270c5b3 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -27,6 +27,7 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <X11/X.h>
 #include <X11/Xmd.h>
 
diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c
index 50f88cdc9..ee2b2154a 100644
--- a/hw/xfree86/os-support/shared/posix_tty.c
+++ b/hw/xfree86/os-support/shared/posix_tty.c
@@ -56,7 +56,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <X11/X.h>
+
 #include <xserver_poll.h>
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
index ad8af6093..e3f0774dc 100644
--- a/hw/xfree86/os-support/shared/sigio.c
+++ b/hw/xfree86/os-support/shared/sigio.c
@@ -56,7 +56,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <X11/X.h>
+
 #include <xserver_poll.h>
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c
index d8bff2fda..8728e920e 100644
--- a/hw/xfree86/os-support/solaris/sun_agp.c
+++ b/hw/xfree86/os-support/solaris/sun_agp.c
@@ -32,7 +32,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <X11/X.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c
index 11549aaf0..6516372d7 100644
--- a/hw/xfree86/os-support/solaris/sun_apm.c
+++ b/hw/xfree86/os-support/solaris/sun_apm.c
@@ -53,7 +53,9 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <X11/X.h>
+
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c
index 69ea50c47..6aa0a37a3 100644
--- a/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/hw/xfree86/os-support/solaris/sun_bell.c
@@ -24,6 +24,7 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
 #include <sys/audio.h>
 #include <sys/uio.h>
 #include <limits.h>
diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c
index d7bf2e54b..415cdb1c8 100644
--- a/hw/xfree86/os-support/solaris/sun_init.c
+++ b/hw/xfree86/os-support/solaris/sun_init.c
@@ -26,6 +26,8 @@
 #include <xorg-config.h>
 #endif
 
+#include <errno.h>
+
 #include "xf86.h"
 #include "xf86Priv.h"
 #include "xf86_OSlib.h"
diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
index 159c8064c..12992914c 100644
--- a/hw/xfree86/os-support/xf86_OSlib.h
+++ b/hw/xfree86/os-support/xf86_OSlib.h
@@ -91,8 +91,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <errno.h>
-
 #if defined(_NEED_SYSI86)
 #if !(defined (__sun) && defined (SVR4))
 #include <sys/immu.h>
@@ -188,8 +186,6 @@ extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
 #include <sys/param.h>
 #endif
 
-#include <errno.h>
-
 #include <sys/stat.h>
 
 #include <sys/mman.h>
@@ -219,8 +215,6 @@ extern _X_HIDDEN char xf86SolarisFbDev[PATH_MAX];
 #define termio termios
 #define POSIX_TTY
 
-#include <errno.h>
-
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index e743a861e..8cd92f296 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -34,6 +34,8 @@
 #include <dix-config.h>
 #endif
 
+#include <errno.h>
+
 #include "quartz.h"
 
 #include "misc.h"
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index de82e2280..5c5bc70ac 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -34,6 +34,7 @@
 #include <dix-config.h>
 #endif
 
+#include <errno.h>
 #include <X11/Xlib.h>
 #include <assert.h>
 #include <unistd.h>
diff --git a/hw/xwayland/xwayland-xtest.c b/hw/xwayland/xwayland-xtest.c
index e4a297ab5..89de93afc 100644
--- a/hw/xwayland/xwayland-xtest.c
+++ b/hw/xwayland/xwayland-xtest.c
@@ -29,6 +29,7 @@
 #include <inpututils.h>
 #include <libgen.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include <libei.h>
 
diff --git a/os/xdmcp.c b/os/xdmcp.c
index 4d4690c70..2a62e9a28 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -34,6 +34,7 @@
 #include <netdb.h>
 #endif
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <X11/X.h>

More information about the xorg-commit mailing list