On Wed, Dec 07, 2011 at 08:40:41AM +1000, Peter Hutterer wrote: > On Fri, Dec 02, 2011 at 11:31:17AM +0000, Daniel Stone wrote: > > Remove unnecessary _X_EXPORT tags from mi headers. > > > > Signed-off-by: Daniel Stone <dan...@fooishbar.org> > > some of these are still used by input drivers, most likely in error. I won't > have time to go through those drivers to fix them up right now, so it may be > better to leave those used alone for now. > I found occurances of the following but I didn't check for ABI checks on > those so double-checking would be good: > miPointerGetScreen() > miPointerSetPosition() > miPointerCurrentScreen() > > I also suspect that VNC may use some of these.
Hello Peter, Daniel, thanks for CCing me. In VNC we use following: - mieqProcessInputEvents Regards, Adam > > Cheers, > Peter > > > --- > > mi/mi.h | 44 ++++++++++++++++++++++---------------------- > > mi/micmap.h | 2 +- > > mi/mifpoly.h | 2 +- > > mi/mipointer.h | 20 ++++++++++---------- > > mi/mipoly.h | 10 +++++----- > > mi/mispans.h | 8 ++++---- > > 6 files changed, 43 insertions(+), 43 deletions(-) > > > > diff --git a/mi/mi.h b/mi/mi.h > > index 24d1af9..f8167bf 100644 > > --- a/mi/mi.h > > +++ b/mi/mi.h > > @@ -192,18 +192,18 @@ extern _X_EXPORT void miStepDash( > > typedef struct _DeviceRec *DevicePtr; > > #endif > > > > -extern _X_EXPORT Bool mieqInit( > > +extern Bool mieqInit( > > void > > ); > > > > -extern _X_EXPORT void mieqFini(void); > > +extern void mieqFini(void); > > > > extern _X_EXPORT void mieqEnqueue( > > DeviceIntPtr /*pDev*/, > > InternalEvent* /*e*/ > > ); > > > > -extern _X_EXPORT void mieqSwitchScreen( > > +extern void mieqSwitchScreen( > > DeviceIntPtr /* pDev */, > > ScreenPtr /*pScreen*/, > > Bool /*set_dequeue_screen*/ > > @@ -215,7 +215,7 @@ extern _X_EXPORT void mieqProcessDeviceEvent( > > ScreenPtr /* screen*/ > > ); > > > > -extern _X_EXPORT void mieqProcessInputEvents( > > +extern void mieqProcessInputEvents( > > void > > ); > > > > @@ -248,7 +248,7 @@ extern _X_EXPORT RegionPtr miHandleExposures( > > unsigned long /*plane*/ > > ); > > > > -extern _X_EXPORT void miSendGraphicsExpose( > > +extern void miSendGraphicsExpose( > > ClientPtr /*client*/, > > RegionPtr /*pRgn*/, > > XID /*drawable*/, > > @@ -256,7 +256,7 @@ extern _X_EXPORT void miSendGraphicsExpose( > > int /*minor*/ > > ); > > > > -extern _X_EXPORT void miSendExposures( > > +extern void miSendExposures( > > WindowPtr /*pWin*/, > > RegionPtr /*pRgn*/, > > int /*dx*/, > > @@ -269,13 +269,13 @@ extern _X_EXPORT void miWindowExposures( > > RegionPtr /*other_exposed*/ > > ); > > > > -extern _X_EXPORT void miPaintWindow( > > +extern void miPaintWindow( > > WindowPtr /*pWin*/, > > RegionPtr /*prgn*/, > > int /*what*/ > > ); > > > > -extern _X_EXPORT void miClearDrawable( > > +extern void miClearDrawable( > > DrawablePtr /*pDraw*/, > > GCPtr /*pGC*/ > > ); > > @@ -434,7 +434,7 @@ extern _X_EXPORT Bool miCreateScreenResources( > > ScreenPtr /*pScreen*/ > > ); > > > > -extern _X_EXPORT Bool miScreenDevPrivateInit( > > +extern Bool miScreenDevPrivateInit( > > ScreenPtr /*pScreen*/, > > int /*width*/, > > pointer /*pbits*/ > > @@ -458,7 +458,7 @@ extern _X_EXPORT Bool miScreenInit( > > > > /* mivaltree.c */ > > > > -extern _X_EXPORT int miShapedWindowIn( > > +extern int miShapedWindowIn( > > RegionPtr /*universe*/, > > RegionPtr /*bounding*/, > > BoxPtr /*rect*/, > > @@ -472,11 +472,11 @@ typedef void > > typedef RegionPtr > > (*GetRedirectBorderClipProcPtr) (WindowPtr pWindow); > > > > -extern _X_EXPORT void > > +extern void > > miRegisterRedirectBorderClipProc (SetRedirectBorderClipProcPtr > > setBorderClip, > > GetRedirectBorderClipProcPtr getBorderClip); > > > > -extern _X_EXPORT int miValidateTree( > > +extern int miValidateTree( > > WindowPtr /*pParent*/, > > WindowPtr /*pChild*/, > > VTKind /*kind*/ > > @@ -500,7 +500,7 @@ extern _X_EXPORT void miWideDash( > > > > /* miwindow.c */ > > > > -extern _X_EXPORT void miClearToBackground( > > +extern void miClearToBackground( > > WindowPtr /*pWin*/, > > int /*x*/, > > int /*y*/, > > @@ -509,21 +509,21 @@ extern _X_EXPORT void miClearToBackground( > > Bool /*generateExposures*/ > > ); > > > > -extern _X_EXPORT void miMarkWindow( > > +extern void miMarkWindow( > > WindowPtr /*pWin*/ > > ); > > > > -extern _X_EXPORT Bool miMarkOverlappedWindows( > > +extern Bool miMarkOverlappedWindows( > > WindowPtr /*pWin*/, > > WindowPtr /*pFirst*/, > > WindowPtr * /*ppLayerWin*/ > > ); > > > > -extern _X_EXPORT void miHandleValidateExposures( > > +extern void miHandleValidateExposures( > > WindowPtr /*pWin*/ > > ); > > > > -extern _X_EXPORT void miMoveWindow( > > +extern void miMoveWindow( > > WindowPtr /*pWin*/, > > int /*x*/, > > int /*y*/, > > @@ -531,7 +531,7 @@ extern _X_EXPORT void miMoveWindow( > > VTKind /*kind*/ > > ); > > > > -extern _X_EXPORT void miSlideAndSizeWindow( > > +extern void miSlideAndSizeWindow( > > WindowPtr /*pWin*/, > > int /*x*/, > > int /*y*/, > > @@ -540,21 +540,21 @@ extern _X_EXPORT void miSlideAndSizeWindow( > > WindowPtr /*pSib*/ > > ); > > > > -extern _X_EXPORT WindowPtr miGetLayerWindow( > > +extern WindowPtr miGetLayerWindow( > > WindowPtr /*pWin*/ > > ); > > > > -extern _X_EXPORT void miSetShape( > > +extern void miSetShape( > > WindowPtr /*pWin*/, > > int /*kind*/ > > ); > > > > -extern _X_EXPORT void miChangeBorderWidth( > > +extern void miChangeBorderWidth( > > WindowPtr /*pWin*/, > > unsigned int /*width*/ > > ); > > > > -extern _X_EXPORT void miMarkUnrealizedWindow( > > +extern void miMarkUnrealizedWindow( > > WindowPtr /*pChild*/, > > WindowPtr /*pWin*/, > > Bool /*fromConfigure*/ > > diff --git a/mi/micmap.h b/mi/micmap.h > > index c67710c..6d628ea 100644 > > --- a/mi/micmap.h > > +++ b/mi/micmap.h > > @@ -9,7 +9,7 @@ > > #define SetInstalledmiColormap(s,c) \ > > (dixSetPrivate(&(s)->devPrivates, micmapScrPrivateKey, c)) > > > > -extern _X_EXPORT DevPrivateKeyRec micmapScrPrivateKeyRec; > > +extern DevPrivateKeyRec micmapScrPrivateKeyRec; > > #define micmapScrPrivateKey (&micmapScrPrivateKeyRec) > > > > typedef Bool (* miInitVisualsProcPtr)(VisualPtr *, DepthPtr *, int *, int > > *, > > diff --git a/mi/mifpoly.h b/mi/mifpoly.h > > index cc779c9..4fc6557 100644 > > --- a/mi/mifpoly.h > > +++ b/mi/mifpoly.h > > @@ -88,7 +88,7 @@ typedef struct _SppArc { > > > > /* mifpolycon.c */ > > > > -extern _X_EXPORT void miFillSppPoly( > > +extern void miFillSppPoly( > > DrawablePtr /*dst*/, > > GCPtr /*pgc*/, > > int /*count*/, > > diff --git a/mi/mipointer.h b/mi/mipointer.h > > index 45abb5b..7308bb9 100644 > > --- a/mi/mipointer.h > > +++ b/mi/mipointer.h > > @@ -96,14 +96,14 @@ extern _X_EXPORT Bool miDCInitialize( > > miPointerScreenFuncPtr /*screenFuncs*/ > > ); > > > > -extern _X_EXPORT Bool miPointerInitialize( > > +extern Bool miPointerInitialize( > > ScreenPtr /*pScreen*/, > > miPointerSpriteFuncPtr /*spriteFuncs*/, > > miPointerScreenFuncPtr /*screenFuncs*/, > > Bool /*waitForUpdate*/ > > ); > > > > -extern _X_EXPORT void miPointerWarpCursor( > > +extern void miPointerWarpCursor( > > DeviceIntPtr /*pDev*/, > > ScreenPtr /*pScreen*/, > > int /*x*/, > > @@ -111,13 +111,13 @@ extern _X_EXPORT void miPointerWarpCursor( > > ); > > > > /* Deprecated in favour of miPointerGetScreen. */ > > -extern _X_EXPORT ScreenPtr miPointerCurrentScreen( > > +extern ScreenPtr miPointerCurrentScreen( > > void > > ) _X_DEPRECATED; > > > > -extern _X_EXPORT ScreenPtr miPointerGetScreen( > > +extern ScreenPtr miPointerGetScreen( > > DeviceIntPtr pDev); > > -extern _X_EXPORT void miPointerSetScreen( > > +extern void miPointerSetScreen( > > DeviceIntPtr pDev, > > int screen_num, > > int x, > > @@ -131,24 +131,24 @@ extern _X_EXPORT void miPointerGetPosition( > > > > /* Moves the cursor to the specified position. May clip the co-ordinates: > > * x and y are modified in-place. */ > > -extern _X_EXPORT ScreenPtr miPointerSetPosition( > > +extern ScreenPtr miPointerSetPosition( > > DeviceIntPtr pDev, > > int mode, > > double *x, > > double *y); > > > > -extern _X_EXPORT void miPointerUpdateSprite( > > +extern void miPointerUpdateSprite( > > DeviceIntPtr pDev); > > > > /* Sets whether the sprite should be updated immediately on pointer moves > > */ > > -extern _X_EXPORT Bool miPointerSetWaitForUpdate( > > +extern Bool miPointerSetWaitForUpdate( > > ScreenPtr pScreen, > > Bool wait); > > > > -extern _X_EXPORT DevPrivateKeyRec miPointerPrivKeyRec; > > +extern DevPrivateKeyRec miPointerPrivKeyRec; > > #define miPointerPrivKey (&miPointerPrivKeyRec) > > > > -extern _X_EXPORT DevPrivateKeyRec miPointerScreenKeyRec; > > +extern DevPrivateKeyRec miPointerScreenKeyRec; > > #define miPointerScreenKey (&miPointerScreenKeyRec) > > > > #endif /* MIPOINTER_H */ > > diff --git a/mi/mipoly.h b/mi/mipoly.h > > index d94796e..c1bab49 100644 > > --- a/mi/mipoly.h > > +++ b/mi/mipoly.h > > @@ -180,7 +180,7 @@ typedef struct _ScanLineListBlock { > > > > /* mipolyutil.c */ > > > > -extern _X_EXPORT Bool miCreateETandAET( > > +extern Bool miCreateETandAET( > > int /*count*/, > > DDXPointPtr /*pts*/, > > EdgeTable * /*ET*/, > > @@ -189,19 +189,19 @@ extern _X_EXPORT Bool miCreateETandAET( > > ScanLineListBlock * /*pSLLBlock*/ > > ); > > > > -extern _X_EXPORT void miloadAET( > > +extern void miloadAET( > > EdgeTableEntry * /*AET*/, > > EdgeTableEntry * /*ETEs*/ > > ); > > > > -extern _X_EXPORT void micomputeWAET( > > +extern void micomputeWAET( > > EdgeTableEntry * /*AET*/ > > ); > > > > -extern _X_EXPORT int miInsertionSort( > > +extern int miInsertionSort( > > EdgeTableEntry * /*AET*/ > > ); > > > > -extern _X_EXPORT void miFreeStorage( > > +extern void miFreeStorage( > > ScanLineListBlock * /*pSLLBlock*/ > > ); > > diff --git a/mi/mispans.h b/mi/mispans.h > > index c3a3e67..b035416 100644 > > --- a/mi/mispans.h > > +++ b/mi/mispans.h > > @@ -62,26 +62,26 @@ typedef struct { > > } SpanGroup; > > > > /* Initialize SpanGroup. MUST BE DONE before use. */ > > -extern _X_EXPORT void miInitSpanGroup( > > +extern void miInitSpanGroup( > > SpanGroup * /*spanGroup*/ > > ); > > > > /* Add a Spans to a SpanGroup. The spans MUST BE in y-sorted order */ > > -extern _X_EXPORT void miAppendSpans( > > +extern void miAppendSpans( > > SpanGroup * /*spanGroup*/, > > SpanGroup * /*otherGroup*/, > > Spans * /*spans*/ > > ); > > > > /* Paint a span group, insuring that each pixel is painted at most once */ > > -extern _X_EXPORT void miFillUniqueSpanGroup( > > +extern void miFillUniqueSpanGroup( > > DrawablePtr /*pDraw*/, > > GCPtr /*pGC*/, > > SpanGroup * /*spanGroup*/ > > ); > > > > /* Free up data in a span group. MUST BE DONE or you'll suffer memory > > leaks */ > > -extern _X_EXPORT void miFreeSpanGroup( > > +extern void miFreeSpanGroup( > > SpanGroup * /*spanGroup*/ > > ); > > > > -- > > 1.7.7.3 > > > > _______________________________________________ > > xorg-devel@lists.x.org: X.Org development > > Archives: http://lists.x.org/archives/xorg-devel > > Info: http://lists.x.org/mailman/listinfo/xorg-devel > > -- Adam Tkac, Red Hat, Inc. _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel