From 950462f6e67db0e358643e0a488404dc630a9d88 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: make XkbRF_Create() static inline"

This reverts commit 60d37d0158ad9e1c29e4740e73911083e218c332.

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

diff --git a/xkb/maprules.c b/xkb/maprules.c
index 9c6f7c2b3..83abe8076 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -970,6 +970,16 @@ XkbRF_LoadRules(FILE * file, XkbRF_RulesPtr rules)
     return TRUE;
 }
 
+/***====================================================================***/
+
+XkbRF_RulesPtr
+XkbRF_Create(void)
+{
+    return calloc(1, sizeof(XkbRF_RulesRec));
+}
+
+/***====================================================================***/
+
 void
 XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules)
 {
diff --git a/xkb/xkbrules_priv.h b/xkb/xkbrules_priv.h
index 3739c15a8..b494edb8d 100644
--- a/xkb/xkbrules_priv.h
+++ b/xkb/xkbrules_priv.h
@@ -6,7 +6,6 @@
 #define _XSERVER_XKB_XKBRULES_PRIV_H
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <X11/Xdefs.h>
 
 #include "include/xkbrules.h"
@@ -51,10 +50,7 @@ Bool XkbRF_GetComponents(XkbRF_RulesPtr rules,
 
 Bool XkbRF_LoadRules(FILE *file, XkbRF_RulesPtr rules);
 
-static inline XkbRF_RulesPtr XkbRF_Create(void)
-{
-    return calloc(1, sizeof(XkbRF_RulesRec));
-}
+XkbRF_RulesPtr XkbRF_Create(void);
 
 void XkbRF_Free(XkbRF_RulesPtr rules, Bool freeRules);