From 396e3e7a54dab218ab9dde518912da936990480a 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: unexport XkbRF_GroupRec struct"

This reverts commit 83c8a90a61a2dbeb755752ac66e16506be9aba34.

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

diff --git a/include/xkbrules.h b/include/xkbrules.h
index 2add6996e..98068afac 100644
--- a/include/xkbrules.h
+++ b/include/xkbrules.h
@@ -61,4 +61,10 @@ typedef struct _XkbRF_Rule {
     unsigned flags;
 } XkbRF_RuleRec, *XkbRF_RulePtr;
 
+typedef struct _XkbRF_Group {
+    int number;
+    const char *name;
+    char *words;
+} XkbRF_GroupRec, *XkbRF_GroupPtr;
+
 #endif                          /* _XKBRULES_H_ */
diff --git a/xkb/xkbrules_priv.h b/xkb/xkbrules_priv.h
index 918be5339..71b1a8cd0 100644
--- a/xkb/xkbrules_priv.h
+++ b/xkb/xkbrules_priv.h
@@ -10,12 +10,6 @@
 
 #include "include/xkbrules.h"
 
-typedef struct _XkbRF_Group {
-    int number;
-    const char *name;
-    char *words;
-} XkbRF_GroupRec, *XkbRF_GroupPtr;
-
 typedef struct _XkbRF_Rules {
     unsigned short sz_rules;
     unsigned short num_rules;