xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/xf86_OSproc.h |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 9bc7d96a457d1bdb6b09036b4808f5ec4beca013
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 14 13:25:57 2024 +0100

    xfree86: os-support: drop unused NO_OSLIB_PROTOTYPES guard
    
    The last user was removed a decade ago by commit
    a6fcb15472bb7663ae917f5913bf07b6d3c7f186.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1407>

diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h
index 05a7cd820..88a1ee98a 100644
--- a/hw/xfree86/os-support/xf86_OSproc.h
+++ b/hw/xfree86/os-support/xf86_OSproc.h
@@ -87,7 +87,6 @@
 #define XF86_M_RNG		0x080   /* ring */
 #define XF86_M_DSR		0x100   /* data set ready */
 
-#ifndef NO_OSLIB_PROTOTYPES
 /*
  * This is to prevent re-entrancy to FatalError() when aborting.
  * Anything that can be called as a result of ddxGiveUp() should use this
@@ -198,5 +197,4 @@ xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs);
 #endif
 
 _XFUNCPROTOEND
-#endif                          /* NO_OSLIB_PROTOTYPES */
 #endif                          /* _XF86_OSPROC_H */