From 9cac71e660beea6882afc4d51e90894f025708ed Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sat, 12 Jul 2025 11:47:06 -0700 Subject: [PATCH] Revert "xkb: move _XKB_RF_NAMES_PROP_ATOM define into xkbInit.c" This reverts commit 1a9592ea4b37fbdcb7cbf0f72dcde5159cfd6094. Part-of: --- include/xkbrules.h | 4 ++++ xkb/xkbInit.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/xkbrules.h b/include/xkbrules.h index 6be20ea5f..8f8ad11e7 100644 --- a/include/xkbrules.h +++ b/include/xkbrules.h @@ -103,5 +103,9 @@ extern _X_EXPORT void XkbRF_Free(XkbRF_RulesPtr /* rules */ , Bool /* freeRules */ ); +/***====================================================================***/ + +#define _XKB_RF_NAMES_PROP_ATOM "_XKB_RULES_NAMES" + _XFUNCPROTOEND #endif /* _XKBRULES_H_ */ diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c index d187a1e87..edd4de4b5 100644 --- a/xkb/xkbInit.c +++ b/xkb/xkbInit.c @@ -49,8 +49,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "scrnintstr.h" #include "xkbgeom.h" -#define _XKB_RF_NAMES_PROP_ATOM "_XKB_RULES_NAMES" - #define CREATE_ATOM(s) MakeAtom(s,sizeof(s)-1,1) #if defined(__alpha) || defined(__alpha__)