From 01fa00fb906b21199233f76c774a505768df4b17 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_RulesRec struct"

This reverts commit 043dc8041c09c444fe04b0322518205bd668b31c.

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

diff --git a/include/xkbrules.h b/include/xkbrules.h
index 98068afac..b2c1c7230 100644
--- a/include/xkbrules.h
+++ b/include/xkbrules.h
@@ -67,4 +67,13 @@ typedef struct _XkbRF_Group {
     char *words;
 } XkbRF_GroupRec, *XkbRF_GroupPtr;
 
+typedef struct _XkbRF_Rules {
+    unsigned short sz_rules;
+    unsigned short num_rules;
+    XkbRF_RulePtr rules;
+    unsigned short sz_groups;
+    unsigned short num_groups;
+    XkbRF_GroupPtr groups;
+} XkbRF_RulesRec, *XkbRF_RulesPtr;
+
 #endif                          /* _XKBRULES_H_ */
diff --git a/xkb/xkbrules_priv.h b/xkb/xkbrules_priv.h
index 71b1a8cd0..8f1688030 100644
--- a/xkb/xkbrules_priv.h
+++ b/xkb/xkbrules_priv.h
@@ -10,15 +10,6 @@
 
 #include "include/xkbrules.h"
 
-typedef struct _XkbRF_Rules {
-    unsigned short sz_rules;
-    unsigned short num_rules;
-    XkbRF_RulePtr rules;
-    unsigned short sz_groups;
-    unsigned short num_groups;
-    XkbRF_GroupPtr groups;
-} XkbRF_RulesRec, *XkbRF_RulesPtr;
-
 struct _XkbComponentNames;
 
 Bool XkbRF_GetComponents(XkbRF_RulesPtr rules,