From 984453ad4fb16d9e2912ea3789a4fff81a919f44 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Wed, 21 May 2025 19:50:24 +0200 Subject: [PATCH] xfree86: drop ifdefs on _NO_XF86_PROTOTYPES Nothing ever sets this symbol, so can be dropped. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/common/xf86.h | 5 ----- hw/xfree86/common/xf86Priv.h | 5 ----- 2 files changed, 10 deletions(-) diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index dae11fb9f..07b098079 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -93,9 +93,6 @@ extern _X_EXPORT Bool xf86DRI2Enabled(void); static inline _X_DEPRECATED int xf86BlockSIGIO(void) { input_lock(); return 0; } static inline _X_DEPRECATED void xf86UnblockSIGIO(int wasset) { input_unlock(); } -/* Function Prototypes */ -#ifndef _NO_XF86_PROTOTYPES - /* PCI related */ #ifdef XSERVER_LIBPCIACCESS #include @@ -381,8 +378,6 @@ extern _X_EXPORT ScrnInfoPtr xf86ScreenToScrn(ScreenPtr pScreen); /* convert ScrnInfoPtr to ScreenPtr */ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn); -#endif /* _NO_XF86_PROTOTYPES */ - #define XF86_HAS_SCRN_CONV 1 /* define for drivers to use in api compat */ #define XF86_SCRN_INTERFACE 1 /* define for drivers to use in api compat */ diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 4f3add769..489e54ee0 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -104,9 +104,6 @@ extern _X_EXPORT int xf86DRMMasterFd; /* Command line argument for #define DEFAULT_DPI 96 #endif -/* Function Prototypes */ -#ifndef _NO_XF86_PROTOTYPES - /* xf86Bus.c */ extern _X_EXPORT Bool xf86BusConfig(void); extern _X_EXPORT void xf86BusProbe(void); @@ -157,6 +154,4 @@ xf86CallDriverProbe(struct _DriverRec *drv, Bool detect_only); extern _X_EXPORT Bool xf86HasTTYs(void); -#endif /* _NO_XF86_PROTOTYPES */ - #endif /* _XF86PRIV_H */