From ca14f9da2b5df705553030e7a5ab46ddfddb7581 Mon Sep 17 00:00:00 2001 From: kohnish Date: Tue, 18 Nov 2025 21:40:41 +0100 Subject: [PATCH] Revert "mi: unexport miWideArc()" This reverts commit aaaa0a35e5981b77f5bc9303799db566e746b600. Part-of: --- mi/mi.h | 5 +++++ mi/mi_priv.h | 9 +-------- mi/miarc.c | 6 ++---- mi/mizerarc.c | 4 +--- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/mi/mi.h b/mi/mi.h index c2a1c4a10..d0c50a35d 100644 --- a/mi/mi.h +++ b/mi/mi.h @@ -67,6 +67,11 @@ typedef struct _miDash *miDashPtr; /* miarc.c */ +extern _X_EXPORT void miWideArc(DrawablePtr pDraw, + GCPtr pGC, + int narcs, + xArc * parcs); + extern _X_EXPORT void miPolyArc(DrawablePtr /*pDraw */ , GCPtr /*pGC */ , int /*narcs */ , diff --git a/mi/mi_priv.h b/mi/mi_priv.h index 7711d4255..26c9d158f 100644 --- a/mi/mi_priv.h +++ b/mi/mi_priv.h @@ -5,15 +5,8 @@ #ifndef _XSERVER_MI_PRIV_H #define _XSERVER_MI_PRIV_H -#include - -#include "include/gc.h" -#include "include/pixmap.h" -#include "include/screenint.h" -#include "mi/mi.h" +#include "screenint.h" void miScreenClose(ScreenPtr pScreen); -void miWideArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs); - #endif /* _XSERVER_MI_PRIV_H */ diff --git a/mi/miarc.c b/mi/miarc.c index 9ea4a6155..602ccbf76 100644 --- a/mi/miarc.c +++ b/mi/miarc.c @@ -51,17 +51,15 @@ SOFTWARE. #include #include #include -#include - -#include "mi/mi_priv.h" - #include "misc.h" #include "gcstruct.h" #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" #include "mifpoly.h" +#include "mi.h" #include "mifillarc.h" +#include #define EPSILON 0.000001 #define ISEQUAL(a,b) (fabs((a) - (b)) <= EPSILON) diff --git a/mi/mizerarc.c b/mi/mizerarc.c index 90dde9f8b..ca2cb4087 100644 --- a/mi/mizerarc.c +++ b/mi/mizerarc.c @@ -37,12 +37,10 @@ Author: Bob Scheifler, MIT X Consortium #include #include #include - -#include "mi/mi_priv.h" - #include "regionstr.h" #include "gcstruct.h" #include "pixmapstr.h" +#include "mi.h" #include "mizerarc.h" #define FULLCIRCLE (360 * 64)