frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: common: move private defs from xf86Xinput.h to xf86Xinput_priv.h 

public server module API headers shouldn't be clobbered with non-exported
definitions, so move them out to private header file.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-02-09 17:29:39 +01:00
parent 27233c3fa1
commit 7a4dbf52b2
9 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/common/xf86Config.c
View File

@ -62,6 +62,7 @@
#include "xf86pciBus.h" #include "xf86pciBus.h"
#include "xf86Xinput.h" #include "xf86Xinput.h"
#include "loaderProcs.h" #include "loaderProcs.h"
#include "xf86Xinput_priv.h"
#include "xkbsrv.h" #include "xkbsrv.h"
#include "picture.h" #include "picture.h"

2
hw/xfree86/common/xf86Events.c
View File

@ -71,7 +71,7 @@
#include <X11/extensions/XI.h> #include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h> #include <X11/extensions/XIproto.h>
#include "inputstr.h" #include "inputstr.h"
#include "xf86Xinput.h" #include "xf86Xinput_priv.h"
#include "mi.h" #include "mi.h"
#include "mipointer.h" #include "mipointer.h"

2
hw/xfree86/common/xf86Helper.c
View File

@ -52,7 +52,7 @@
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#include "micmap.h" #include "micmap.h"
#include "xf86DDC.h" #include "xf86DDC.h"
#include "xf86Xinput.h" #include "xf86Xinput_priv.h"
#include "xf86InPriv.h" #include "xf86InPriv.h"
#include "mivalidate.h" #include "mivalidate.h"

2
hw/xfree86/common/xf86PM.c
View File

@ -32,7 +32,7 @@
#include <X11/X.h> #include <X11/X.h>
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86Xinput.h" #include "xf86Xinput_priv.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
int (*xf86PMGetEventFromOs) (int fd, pmEvent * events, int num) = NULL; int (*xf86PMGetEventFromOs) (int fd, pmEvent * events, int num) = NULL;

2
hw/xfree86/common/xf86Xinput.c
View File

@ -58,7 +58,7 @@
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86Config.h" #include "xf86Config.h"
#include "xf86Xinput.h" #include "xf86Xinput_priv.h"
#include "xf86Optrec.h" #include "xf86Optrec.h"
#include "mipointer.h" #include "mipointer.h"
#include "extinit.h" #include "extinit.h"

7
hw/xfree86/common/xf86Xinput.h
View File

@ -113,9 +113,6 @@ struct _InputInfoRec {
InputAttributes *attrs; InputAttributes *attrs;
}; };
/* xf86Globals.c */
extern InputInfoPtr xf86InputDevs;
/* xf86Xinput.c */ /* xf86Xinput.c */
extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute, extern _X_EXPORT void xf86PostMotionEvent(DeviceIntPtr device, int is_absolute,
int first_valuator, int num_valuators, int first_valuator, int num_valuators,
@ -189,10 +186,6 @@ extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev); extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);
extern _X_EXPORT void xf86InputEnableVTProbe(void); extern _X_EXPORT void xf86InputEnableVTProbe(void);
/* not exported */
int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
InputInfoPtr xf86AllocateInput(void);
/* xf86Helper.c */ /* xf86Helper.c */
extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, void *module, extern _X_EXPORT void xf86AddInputDriver(InputDriverPtr driver, void *module,
int flags); int flags);

15
hw/xfree86/common/xf86Xinput_priv.h Normal file
View File

@ -0,0 +1,15 @@
/* SPDX-License-Identifier: MIT OR X11
*
* Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
*/
#ifndef _XSERVER__XF86XINPUT_H
#define _XSERVER__XF86XINPUT_H
#include "xf86Xinput.h"
extern InputInfoPtr xf86InputDevs;
int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
InputInfoPtr xf86AllocateInput(void);
#endif /* _XSERVER__XF86XINPUT_H */

2
hw/xfree86/os-support/linux/systemd-logind.c
View File

@ -37,7 +37,7 @@
#include "linux.h" #include "linux.h"
#include "xf86.h" #include "xf86.h"
#include "xf86platformBus_priv.h" #include "xf86platformBus_priv.h"
#include "xf86Xinput.h" #include "xf86Xinput_priv.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "globals.h" #include "globals.h"

3
hw/xfree86/os-support/xf86OSpriv.h
View File

@ -39,6 +39,9 @@ typedef struct {
void xf86OSInitVidMem(VidMemInfoPtr); void xf86OSInitVidMem(VidMemInfoPtr);
#ifdef XSERVER_PLATFORM_BUS #ifdef XSERVER_PLATFORM_BUS
struct OdevAttributes;
#include "hotplug.h" #include "hotplug.h"
void void
xf86PlatformDeviceProbe(struct OdevAttributes *attribs); xf86PlatformDeviceProbe(struct OdevAttributes *attribs);