From 02e61f15a9fd9b0268d7d358286e7a2be0ffc8a2 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 5 May 2025 19:28:30 +0200
Subject: [PATCH] fb: pict: unexport fbRasterizeTrapezoid()

Not used by any drivers, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 fb/fbpict.c      |  3 ++-
 fb/fbpict.h      |  5 ++---
 fb/fbpict_priv.h | 16 ++++++++++++++++
 fb/fbtrap.c      |  3 ++-
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 fb/fbpict_priv.h

diff --git a/fb/fbpict.c b/fb/fbpict.c
index 76b7aaf00..1eeaccf5d 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -27,11 +27,12 @@
 
 #include <string.h>
 
+#include "fb/fbpict_priv.h"
+
 #include "fb.h"
 #include "glyphstr_priv.h"
 #include "picturestr.h"
 #include "mipict.h"
-#include "fbpict.h"
 
 void
 fbComposite(CARD8 op,
diff --git a/fb/fbpict.h b/fb/fbpict.h
index 201ea092e..e64035d1d 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -28,6 +28,8 @@
 #ifndef _FBPICT_H_
 #define _FBPICT_H_
 
+#include "fb.h"
+
 /* fbpict.c */
 extern _X_EXPORT void
 fbComposite(CARD8 op,
@@ -45,9 +47,6 @@ extern _X_EXPORT void
 fbAddTraps(PicturePtr pPicture,
            INT16 xOff, INT16 yOff, int ntrap, xTrap * traps);
 
-extern _X_EXPORT void
-fbRasterizeTrapezoid(PicturePtr alpha, xTrapezoid * trap, int x_off, int y_off);
-
 extern _X_EXPORT void
 fbAddTriangles(PicturePtr pPicture,
                INT16 xOff, INT16 yOff, int ntri, xTriangle * tris);
diff --git a/fb/fbpict_priv.h b/fb/fbpict_priv.h
new file mode 100644
index 000000000..56129bba9
--- /dev/null
+++ b/fb/fbpict_priv.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef XORG_FBPICT_PRIV_H
+#define XORG_FBPICT_PRIV_H
+
+#include <X11/extensions/renderproto.h>
+
+#include "fb/fbpict.h"
+#include "render/picture.h"
+
+void fbRasterizeTrapezoid(PicturePtr alpha, xTrapezoid *trap,
+                          int x_off, int y_off);
+
+#endif /* XORG_FBPICT_PRIV_H */
diff --git a/fb/fbtrap.c b/fb/fbtrap.c
index 0893d168f..edb3cc44c 100644
--- a/fb/fbtrap.c
+++ b/fb/fbtrap.c
@@ -22,11 +22,12 @@
 
 #include <dix-config.h>
 
+#include "fb/fbpict_priv.h"
+
 #include "fb.h"
 
 #include "picturestr.h"
 #include "mipict.h"
-#include "fbpict.h"
 #include "damage.h"
 
 void