From adf0fa5b195148c8342771906db2e27050c30985 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat, 12 Jul 2025 11:47:06 -0700
Subject: [PATCH] Revert "xkb: move XkbRF_* defines into xkb/maprules.c"

This reverts commit b535fd7a4c4baec990e726fb2c4c00b74c1cc57b.

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2046>
---
 include/xkbrules.h | 5 +++++
 xkb/maprules.c     | 6 +-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/include/xkbrules.h b/include/xkbrules.h
index 74473cb24..6be20ea5f 100644
--- a/include/xkbrules.h
+++ b/include/xkbrules.h
@@ -67,6 +67,11 @@ typedef struct _XkbRF_Group {
     char *words;
 } XkbRF_GroupRec, *XkbRF_GroupPtr;
 
+#define	XkbRF_PendingMatch	(1L<<1)
+#define	XkbRF_Option		(1L<<2)
+#define	XkbRF_Append		(1L<<3)
+#define	XkbRF_Normal		(1L<<4)
+
 typedef struct _XkbRF_Rules {
     unsigned short sz_rules;
     unsigned short num_rules;
diff --git a/xkb/maprules.c b/xkb/maprules.c
index 395b5bfab..a324c67a0 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -47,11 +47,7 @@
 #include "xkbstr.h"
 #include <xkbsrv.h>
 
-
-#define XkbRF_PendingMatch      (1L<<1)
-#define XkbRF_Option            (1L<<2)
-#define XkbRF_Append            (1L<<3)
-#define XkbRF_Normal            (1L<<4)
+/***====================================================================***/
 
 #define DFLT_LINE_SIZE	128