From 6bd82e64a030f678a75945ec65e1a559f3c44fac Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Wed, 21 May 2025 14:46:30 +0200
Subject: [PATCH] xfree86: fbman: move FBManagerFuncs into x86fbman.c

Only used here, so no need to keep it in public API.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 hw/xfree86/common/xf86fbman.c | 28 ++++++++++++++++++++++++++++
 hw/xfree86/common/xf86fbman.h | 28 ----------------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c
index 56c239f8d..a2e42eda1 100644
--- a/hw/xfree86/common/xf86fbman.c
+++ b/hw/xfree86/common/xf86fbman.c
@@ -42,6 +42,34 @@
 #define DEBUG
 */
 
+typedef struct {
+    FBAreaPtr(*AllocateOffscreenArea) (ScreenPtr pScreen,
+                                       int w, int h,
+                                       int granularity,
+                                       MoveAreaCallbackProcPtr moveCB,
+                                       RemoveAreaCallbackProcPtr removeCB,
+                                       void *privData);
+    void (*FreeOffscreenArea) (FBAreaPtr area);
+    Bool (*ResizeOffscreenArea) (FBAreaPtr area, int w, int h);
+    Bool (*QueryLargestOffscreenArea) (ScreenPtr pScreen,
+                                       int *width, int *height,
+                                       int granularity,
+                                       int preferences, int priority);
+/* linear functions */
+     FBLinearPtr(*AllocateOffscreenLinear) (ScreenPtr pScreen,
+                                            int size,
+                                            int granularity,
+                                            MoveLinearCallbackProcPtr moveCB,
+                                            RemoveLinearCallbackProcPtr
+                                            removeCB, void *privData);
+    void (*FreeOffscreenLinear) (FBLinearPtr area);
+    Bool (*ResizeOffscreenLinear) (FBLinearPtr area, int size);
+    Bool (*QueryLargestOffscreenLinear) (ScreenPtr pScreen,
+                                         int *size,
+                                         int granularity, int priority);
+    Bool (*PurgeOffscreenAreas) (ScreenPtr);
+} FBManagerFuncs, *FBManagerFuncsPtr;
+
 static DevPrivateKeyRec xf86FBManagerKeyRec;
 static DevPrivateKey xf86FBManagerKey;
 
diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h
index fda740e13..64b9a31cb 100644
--- a/hw/xfree86/common/xf86fbman.h
+++ b/hw/xfree86/common/xf86fbman.h
@@ -66,34 +66,6 @@ typedef void (*RemoveAreaCallbackProcPtr) (FBAreaPtr);
 typedef void (*MoveLinearCallbackProcPtr) (FBLinearPtr, FBLinearPtr);
 typedef void (*RemoveLinearCallbackProcPtr) (FBLinearPtr);
 
-typedef struct {
-    FBAreaPtr(*AllocateOffscreenArea) (ScreenPtr pScreen,
-                                       int w, int h,
-                                       int granularity,
-                                       MoveAreaCallbackProcPtr moveCB,
-                                       RemoveAreaCallbackProcPtr removeCB,
-                                       void *privData);
-    void (*FreeOffscreenArea) (FBAreaPtr area);
-    Bool (*ResizeOffscreenArea) (FBAreaPtr area, int w, int h);
-    Bool (*QueryLargestOffscreenArea) (ScreenPtr pScreen,
-                                       int *width, int *height,
-                                       int granularity,
-                                       int preferences, int priority);
-/* linear functions */
-     FBLinearPtr(*AllocateOffscreenLinear) (ScreenPtr pScreen,
-                                            int size,
-                                            int granularity,
-                                            MoveLinearCallbackProcPtr moveCB,
-                                            RemoveLinearCallbackProcPtr
-                                            removeCB, void *privData);
-    void (*FreeOffscreenLinear) (FBLinearPtr area);
-    Bool (*ResizeOffscreenLinear) (FBLinearPtr area, int size);
-    Bool (*QueryLargestOffscreenLinear) (ScreenPtr pScreen,
-                                         int *size,
-                                         int granularity, int priority);
-    Bool (*PurgeOffscreenAreas) (ScreenPtr);
-} FBManagerFuncs, *FBManagerFuncsPtr;
-
 extern _X_EXPORT Bool
  xf86InitFBManager(ScreenPtr pScreen, BoxPtr FullBox);