summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2014-05-23 11:21:28 -0400
committerAdam Jackson <ajax@redhat.com>2014-10-27 15:45:01 -0400
commit9bdc9b0113915de3d536b2b3f025915379c2126f (patch)
tree79aa15f9ab538730619372a5bd39b5196f6b9532 /mi
parentd181e52ceb9ae44e1faa8d5af8805f43328da6c2 (diff)
mi: Unexport wide line details
XAA wanted these, once upon a time, but that's gone now. Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'mi')
-rw-r--r--mi/Makefile.am2
-rw-r--r--mi/miwideline.c8
-rw-r--r--mi/miwideline.h25
3 files changed, 5 insertions, 30 deletions
diff --git a/mi/Makefile.am b/mi/Makefile.am
index 0cef7798f..526f4bbf6 100644
--- a/mi/Makefile.am
+++ b/mi/Makefile.am
@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libmi.la
if XORG
sdk_HEADERS = micmap.h miline.h mipointer.h mi.h \
migc.h mipointrst.h mizerarc.h micoord.h mifillarc.h \
- mispans.h miwideline.h mistruct.h mifpoly.h mioverlay.h
+ mispans.h mistruct.h mifpoly.h mioverlay.h
endif
AM_CFLAGS = $(DIX_CFLAGS)
diff --git a/mi/miwideline.c b/mi/miwideline.c
index 29ba12c69..295a05a32 100644
--- a/mi/miwideline.c
+++ b/mi/miwideline.c
@@ -273,7 +273,7 @@ miFillRectPolyHelper(DrawablePtr pDrawable,
}
}
-/* static */ int
+static int
miPolyBuildEdge(double x0, double y0, double k, /* x0 * dy - y0 * dx */
int dx, int dy, int xi, int yi, int left, PolyEdgePtr edge)
{
@@ -325,7 +325,7 @@ miPolyBuildEdge(double x0, double y0, double k, /* x0 * dy - y0 * dx */
#define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr)))
-/* static */ int
+static int
miPolyBuildPoly(PolyVertexPtr vertices,
PolySlopePtr slopes,
int count,
@@ -865,7 +865,7 @@ miRoundJoinFace(LineFacePtr face, PolyEdgePtr edge, Bool *leftEdge)
return y;
}
-void
+static void
miRoundJoinClip(LineFacePtr pLeft, LineFacePtr pRight,
PolyEdgePtr edge1, PolyEdgePtr edge2,
int *y1, int *y2, Bool *left1, Bool *left2)
@@ -886,7 +886,7 @@ miRoundJoinClip(LineFacePtr pLeft, LineFacePtr pRight,
*y2 = miRoundJoinFace(pRight, edge2, left2);
}
-int
+static int
miRoundCapClip(LineFacePtr face, Bool isInt, PolyEdgePtr edge, Bool *leftEdge)
{
int y;
diff --git a/mi/miwideline.h b/mi/miwideline.h
index 110541120..a9f2740b5 100644
--- a/mi/miwideline.h
+++ b/mi/miwideline.h
@@ -92,28 +92,3 @@ typedef struct _LineFace {
ValidateGC (pDrawable, pGC); \
} \
}
-
-extern _X_EXPORT void miRoundJoinClip(LineFacePtr /*pLeft */ ,
- LineFacePtr /*pRight */ ,
- PolyEdgePtr /*edge1 */ ,
- PolyEdgePtr /*edge2 */ ,
- int * /*y1 */ ,
- int * /*y2 */ ,
- Bool * /*left1 */ ,
- Bool * /*left2 */
- );
-
-extern _X_EXPORT int miRoundCapClip(LineFacePtr /*face */ ,
- Bool /*isInt */ ,
- PolyEdgePtr /*edge */ ,
- Bool * /*leftEdge */
- );
-
-extern _X_EXPORT int miPolyBuildEdge(double x0, double y0, double k, int dx,
- int dy, int xi, int yi, int left,
- PolyEdgePtr edge);
-extern _X_EXPORT int miPolyBuildPoly(PolyVertexPtr vertices,
- PolySlopePtr slopes, int count, int xi,
- int yi, PolyEdgePtr left,
- PolyEdgePtr right, int *pnleft,
- int *pnright, int *h);