From 7429f8ee8fcc327b36b4163f95ae941bc7ba7343 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 14 Mar 2024 14:40:47 +0100 Subject: [PATCH] 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 Part-of: --- hw/xfree86/os-support/xf86_OSproc.h | 13 ------------- hw/xfree86/os-support/xf86_os_support.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index a83b57bd1..74b71ea34 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -87,19 +87,6 @@ #define XF86_M_RNG 0x080 /* ring */ #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 */ /***************************************************************************/ diff --git a/hw/xfree86/os-support/xf86_os_support.h b/hw/xfree86/os-support/xf86_os_support.h index db02ffeee..a4fe01346 100644 --- a/hw/xfree86/os-support/xf86_os_support.h +++ b/hw/xfree86/os-support/xf86_os_support.h @@ -10,6 +10,21 @@ #include +#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); void xf86OpenConsole(void);