xserver: Branch 'master' - 2 commits

[GitLab Mirror]

 present/present.c         |    1 +
 present/present.h         |    2 ++
 present/present_event.c   |    1 +
 present/present_execute.c |    1 +
 present/present_fake.c    |    1 +
 present/present_fence.c   |    1 +
 present/present_scmd.c    |    1 +
 present/present_screen.c  |    1 +
 present/present_vblank.c  |    1 +
 present/presentext.h      |    5 +++--
 10 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 7ca8c1518cd7b44a92e45de3e5a9242b8938d435
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Feb 19 16:05:27 2025 +0100

    present: need to include <X11/Xfuncproto.h>
    
    Some headers making use of X_EXPORT macro, so Xfuncproto.h should be
    included explicitly, instead of silently relying any other include
    already doing that.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1813>

diff --git a/present/present.h b/present/present.h
index c6762cecc..3aeed270b 100644
--- a/present/present.h
+++ b/present/present.h
@@ -23,7 +23,9 @@
 #ifndef _PRESENT_H_
 #define _PRESENT_H_
 
+#include <X11/Xfuncproto.h>
 #include <X11/extensions/presentproto.h>
+
 #include "randrstr.h"
 #include "presentext.h"
 
diff --git a/present/presentext.h b/present/presentext.h
index f177f55dc..57bd6a6b4 100644
--- a/present/presentext.h
+++ b/present/presentext.h
@@ -23,7 +23,8 @@
 #ifndef _PRESENTEXT_H_
 #define _PRESENTEXT_H_
 
-extern _X_EXPORT void
-present_extension_init(void);
+#include <X11/Xfuncproto.h>
+
+_X_EXPORT void present_extension_init(void);
 
 #endif /* _PRESENTEXT_H_ */
commit b55d726a7b9dfce2cdc770c7f3c3e377f00cbb61
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Tue Feb 18 20:03:35 2025 +0100

    present: need to include dix-config.h
    
    dix-config.h always needs to be included first, otherwise things
    can get messed up in really obscure ways, eg. certain types silently
    changing in size and causing mysterious crashes.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1813>

diff --git a/present/present.c b/present/present.c
index 7e8c7506b..336816e27 100644
--- a/present/present.c
+++ b/present/present.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "present_priv.h"
 #include <gcstruct.h>
diff --git a/present/present_event.c b/present/present_event.c
index b35609b23..adc8a484e 100644
--- a/present/present_event.c
+++ b/present/present_event.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "present_priv.h"
 
diff --git a/present/present_execute.c b/present/present_execute.c
index 5253344a1..449ea5c53 100644
--- a/present/present_execute.c
+++ b/present/present_execute.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "present_priv.h"
 #include <unistd.h>
diff --git a/present/present_fake.c b/present/present_fake.c
index f4a3bd887..3ce7295aa 100644
--- a/present/present_fake.c
+++ b/present/present_fake.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "present_priv.h"
 #include "list.h"
diff --git a/present/present_fence.c b/present/present_fence.c
index aca04a580..821cd6098 100644
--- a/present/present_fence.c
+++ b/present/present_fence.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "present_priv.h"
 #include <gcstruct.h>
diff --git a/present/present_scmd.c b/present/present_scmd.c
index 5f05f8fc9..b60e1b143 100644
--- a/present/present_scmd.c
+++ b/present/present_scmd.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "present_priv.h"
 #include <misync.h>
diff --git a/present/present_screen.c b/present/present_screen.c
index e47cbc6c0..ae56f9032 100644
--- a/present/present_screen.c
+++ b/present/present_screen.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "present_priv.h"
 
diff --git a/present/present_vblank.c b/present/present_vblank.c
index 1c0461e84..72a8b2e3e 100644
--- a/present/present_vblank.c
+++ b/present/present_vblank.c
@@ -19,6 +19,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  */
+#include <dix-config.h>
 
 #include "present_priv.h"
 #include <unistd.h>