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

xfree86: os-support: move xf86FatalError macro out of public header 

This macro is only used inside xfree86's os-support layer, not by any
(known) drivers. Thus no need to have it exported in the public API.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1456>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-14 14:40:47 +01:00 committed by Marge Bot
parent 16a3790d60
commit 7429f8ee8f
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/xfree86/os-support/xf86_OSproc.h
View File

@ -87,19 +87,6 @@
#define XF86_M_RNG 0x080 /* ring */ #define XF86_M_RNG 0x080 /* ring */
#define XF86_M_DSR 0x100 /* data set ready */ #define XF86_M_DSR 0x100 /* data set ready */
/*
* This is to prevent re-entrancy to FatalError() when aborting.
* Anything that can be called as a result of ddxGiveUp() should use this
* instead of FatalError().
*/
#define xf86FatalError(a, b) \
if (dispatchException & DE_TERMINATE) { \
ErrorF(a, b); \
ErrorF("\n"); \
return; \
} else FatalError(a, b)
/***************************************************************************/ /***************************************************************************/
/* Prototypes */ /* Prototypes */
/***************************************************************************/ /***************************************************************************/

15
hw/xfree86/os-support/xf86_os_support.h
View File

@ -10,6 +10,21 @@
#include <X11/Xdefs.h> #include <X11/Xdefs.h>
#include "os.h"
/*
* This is to prevent re-entrancy to FatalError() when aborting.
* Anything that can be called as a result of ddxGiveUp() should use this
* instead of FatalError().
*/
#define xf86FatalError(a, b) \
if (dispatchException & DE_TERMINATE) { \
ErrorF(a, b); \
ErrorF("\n"); \
return; \
} else FatalError(a, b)
typedef void (*PMClose) (void); typedef void (*PMClose) (void);
void xf86OpenConsole(void); void xf86OpenConsole(void);