xserver: Branch 'master'

[GitLab Mirror]

 include/dixfont.h    |    1 -
 include/dixfontstr.h |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit cb7de8921410882b3d6c61b43292c7aa75aa9de2
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Feb 8 16:42:40 2024 +0100

    include: drop unused including of closure.h
    
    The headers dixfont.h and dixfontstr.h include closure.h, but don't use
    any definitions from it, thus the include statements can be dropped.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1280>

diff --git a/include/dixfont.h b/include/dixfont.h
index 65b5d2075..50f2ca0ae 100644
--- a/include/dixfont.h
+++ b/include/dixfont.h
@@ -26,7 +26,6 @@ SOFTWARE.
 
 #include "dix.h"
 #include <X11/fonts/font.h>
-#include "closure.h"
 #include <X11/fonts/fontstruct.h>
 
 #define NullDIXFontProp ((DIXFontPropPtr)0)
diff --git a/include/dixfontstr.h b/include/dixfontstr.h
index 7deb84ac5..eae1a3b58 100644
--- a/include/dixfontstr.h
+++ b/include/dixfontstr.h
@@ -28,7 +28,6 @@ SOFTWARE.
 #include "dixfont.h"
 #include <X11/fonts/fontstruct.h>
 #include <X11/fonts/libxfont2.h>
-#include "closure.h"
 #include <X11/Xproto.h>         /* for xQueryFontReply */
 
 #define FONTCHARSET(font)	  (font)