From 05ffb3ec672309b906e41d6ec24111331a9df782 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Mon, 5 May 2025 13:28:36 +0200
Subject: [PATCH] fb: unexport FbDash*() macros

No external users, so no need to keep them exported.

(note that xf86-video-intel has it's own copies of them)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 fb/fb.h     | 43 -------------------------------------------
 fb/fbbits.h | 43 +++++++++++++++++++++++++++++++++++++++++++
 fb/fbseg.c  |  4 +++-
 3 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/fb/fb.h b/fb/fb.h
index 82c19e017..5bf9d1572 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -223,49 +223,6 @@ typedef int FbStride;
     } \
 }
 
-/* Macros for dealing with dashing */
-
-#define FbDashDeclare	\
-    unsigned char	*__dash, *__firstDash, *__lastDash
-
-#define FbDashInit(pGC,pPriv,dashOffset,dashlen,even) {	    \
-    (even) = TRUE;					    \
-    __firstDash = (pGC)->dash;				    \
-    __lastDash = __firstDash + (pGC)->numInDashList;	    \
-    (dashOffset) %= (pPriv)->dashLength;		    \
-							    \
-    __dash = __firstDash;				    \
-    while ((dashOffset) >= ((dashlen) = *__dash))	    \
-    {							    \
-	(dashOffset) -= (dashlen);			    \
-	(even) = 1-(even);				    \
-	if (++__dash == __lastDash)			    \
-	    __dash = __firstDash;			    \
-    }							    \
-    (dashlen) -= (dashOffset);				    \
-}
-
-#define FbDashNext(dashlen) {				    \
-    if (++__dash == __lastDash)				    \
-	__dash = __firstDash;				    \
-    (dashlen) = *__dash;				    \
-}
-
-/* as numInDashList is always even, this case can skip a test */
-
-#define FbDashNextEven(dashlen) {			    \
-    (dashlen) = *++__dash;				    \
-}
-
-#define FbDashNextOdd(dashlen)	FbDashNext(dashlen)
-
-#define FbDashStep(dashlen,even) {			    \
-    if (!--(dashlen)) {					    \
-	FbDashNext(dashlen);				    \
-	(even) = 1-(even);				    \
-    }							    \
-}
-
 /* Framebuffer access wrapper */
 typedef FbBits(*ReadMemoryProcPtr) (const void *src, int size);
 typedef void (*WriteMemoryProcPtr) (void *dst, FbBits value, int size);
diff --git a/fb/fbbits.h b/fb/fbbits.h
index 1c38c43eb..737d65816 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -48,6 +48,49 @@
     n >>= FB_SHIFT; \
 }
 
+/* Macros for dealing with dashing */
+
+#define FbDashDeclare   \
+    unsigned char       *__dash, *__firstDash, *__lastDash
+
+#define FbDashInit(pGC,pPriv,dashOffset,dashlen,even) {     \
+    (even) = TRUE;                                          \
+    __firstDash = (pGC)->dash;                              \
+    __lastDash = __firstDash + (pGC)->numInDashList;        \
+    (dashOffset) %= (pPriv)->dashLength;                    \
+                                                            \
+    __dash = __firstDash;                                   \
+    while ((dashOffset) >= ((dashlen) = *__dash))           \
+    {                                                       \
+        (dashOffset) -= (dashlen);                          \
+        (even) = 1-(even);                                  \
+        if (++__dash == __lastDash)                         \
+            __dash = __firstDash;                           \
+    }                                                       \
+    (dashlen) -= (dashOffset);                              \
+}
+
+#define FbDashNext(dashlen) {                               \
+    if (++__dash == __lastDash)                             \
+        __dash = __firstDash;                               \
+    (dashlen) = *__dash;                                    \
+}
+
+/* as numInDashList is always even, this case can skip a test */
+
+#define FbDashNextEven(dashlen) {                           \
+    (dashlen) = *++__dash;                                  \
+}
+
+#define FbDashNextOdd(dashlen)  FbDashNext(dashlen)
+
+#define FbDashStep(dashlen,even) {                          \
+    if (!--(dashlen)) {                                     \
+        FbDashNext(dashlen);                                \
+        (even) = 1-(even);                                  \
+    }                                                       \
+}
+
 #ifdef BITSSTORE
 #define STORE(b,x)  BITSSTORE(b,x)
 #else
diff --git a/fb/fbseg.c b/fb/fbseg.c
index 4992973c0..295486e24 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -24,7 +24,9 @@
 
 #include <stdlib.h>
 
-#include "fb.h"
+#include "fb/fb.h"
+#include "fb/fbbits.h"
+
 #include "miline.h"
 
 #define fbBresShiftMask(mask,dir,bpp) ((bpp == FB_STIP_UNIT) ? 0 : \