xserver: Branch 'master' - 4 commits

[GitLab Mirror]

 dix/callback_priv.h  |    2 --
 dix/ptrveloc_priv.h  |   12 ++----------
 dix/screenint_priv.h |    2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

New commits:
commit 080fd7821b4fe71409355d4c5658b745cf06ef97
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 21 11:01:14 2024 +0100

    dix: fix duplicate typedef of CallbackListPtr
    
    fix warning on duplicated typedef:
    
    > In file included from ../dix/main.c:86:
    > ../dix/callback_priv.h:10:31: warning: redefinition of typedef 'CallbackListPtr' is a C11 feature [-Wtypedef-redefinition]
    > typedef struct _CallbackList *CallbackListPtr;
    >                               ^
    > ../include/callback.h:60:31: note: previous definition is here
    > typedef struct _CallbackList *CallbackListPtr;  /* also in misc.h */
    >                               ^
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1427>

diff --git a/dix/callback_priv.h b/dix/callback_priv.h
index d0240bfd7..828b74cf2 100644
--- a/dix/callback_priv.h
+++ b/dix/callback_priv.h
@@ -7,8 +7,6 @@
 
 #include "callback.h"
 
-typedef struct _CallbackList *CallbackListPtr;
-
 void InitCallbackManager(void);
 void DeleteCallbackManager(void);
 
commit 415df761d5436819da3a6fe62b5283f58525c831
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 20 19:28:15 2024 +0100

    dix: fix duplicate typedef of MotionTracker and *MotionTrackerPtr
    
    fix warning on duplicate typedef:
    
    > In file included from ../hw/xfree86/common/xf86Xinput.c:59:
    > ../dix/ptrveloc_priv.h:33:3: warning: redefinition of typedef 'MotionTracker' is a C11 feature [-Wtypedef-redefinition]
    > } MotionTracker, *MotionTrackerPtr;
    >   ^
    > ../include/ptrveloc.h:54:31: note: previous definition is here
    > typedef struct _MotionTracker MotionTracker, *MotionTrackerPtr;
    >                               ^
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1427>

diff --git a/dix/ptrveloc_priv.h b/dix/ptrveloc_priv.h
index 3211585e3..da834e955 100644
--- a/dix/ptrveloc_priv.h
+++ b/dix/ptrveloc_priv.h
@@ -18,11 +18,11 @@ struct _DeviceVelocityRec;
  * calc mean velocity and decide which motion was along
  * a more or less straight line
  */
-typedef struct _MotionTracker {
+struct _MotionTracker {
     double dx, dy;              /* accumulated delta for each axis */
     int time;                   /* time of creation */
     int dir;                    /* initial direction bitfield */
-} MotionTracker, *MotionTrackerPtr;
+};
 
 /**
  * contains the run-time data for the predictable scheme, that is, a
commit df5047fa46aea780b905e4abade32f36bc1be04d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 20 19:26:02 2024 +0100

    dix: fix duplicate typedef of PointerAccelerationProfileFunc
    
    fix warning:
    
    > ../dix/ptrveloc_priv.h:20:18: warning: redefinition of typedef 'PointerAccelerationProfileFunc' is a C11 feature [-Wtypedef-redefinition]
    > typedef double (*PointerAccelerationProfileFunc)
    >                  ^
    > ../include/ptrveloc.h:50:18: note: previous definition is here
    > typedef double (*PointerAccelerationProfileFunc)
    >                  ^
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1427>

diff --git a/dix/ptrveloc_priv.h b/dix/ptrveloc_priv.h
index a96401b90..3211585e3 100644
--- a/dix/ptrveloc_priv.h
+++ b/dix/ptrveloc_priv.h
@@ -13,14 +13,6 @@
 /* fwd */
 struct _DeviceVelocityRec;
 
-/**
- * profile
- * returns actual acceleration depending on velocity, acceleration control,...
- */
-typedef double (*PointerAccelerationProfileFunc)
- (DeviceIntPtr dev, struct _DeviceVelocityRec * vel,
-  double velocity, double threshold, double accelCoeff);
-
 /**
  * a motion history, with just enough information to
  * calc mean velocity and decide which motion was along
commit 8a3cce010188dbb39931f3add0709adc0fe2fe4f
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 20 19:24:20 2024 +0100

    dix: fix duplicate typedef of *ScreenPtr
    
    fix warning:
    
    > In file included from ../hw/xfree86/common/xf86Init.c:53:
    > In file included from ../include/input.h:51:
    > ../include/screenint.h:55:25: warning: redefinition of typedef 'ScreenPtr' is a C11 feature [-Wtypedef-redefinition]
    > typedef struct _Screen *ScreenPtr;
    >                         ^
    > ../dix/screenint_priv.h:11:25: note: previous definition is here
    > typedef struct _Screen *ScreenPtr;
    >                         ^
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1427>

diff --git a/dix/screenint_priv.h b/dix/screenint_priv.h
index 87880e664..616cfbfb6 100644
--- a/dix/screenint_priv.h
+++ b/dix/screenint_priv.h
@@ -8,7 +8,7 @@
 
 #include <X11/Xdefs.h>
 
-typedef struct _Screen *ScreenPtr;
+#include "screenint.h"
 
 typedef Bool (*ScreenInitProcPtr)(ScreenPtr pScreen, int argc, char **argv);