[PATCH 02/31] Xext: _X_UNEXPORT
Daniel Stone
daniel at fooishbar.org
Fri Dec 2 03:31:08 PST 2011
Remove the _X_EXPORT tag from symbols which weren't used by any drivers.
Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
Xext/geint.h | 6 ++--
Xext/panoramiXsrv.h | 32 +++++++++---------
Xext/shmint.h | 6 ++--
Xext/syncsdk.h | 2 +-
Xext/xace.h | 20 +++++-----
Xext/xvdix.h | 94 +++++++++++++++++++++++++-------------------------
Xext/xvmcext.h | 4 +-
include/window.h | 6 ++--
8 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/Xext/geint.h b/Xext/geint.h
index 3e2b8e1..8b522fc 100644
--- a/Xext/geint.h
+++ b/Xext/geint.h
@@ -37,7 +37,7 @@
#include "extnsionst.h"
#include <X11/extensions/geproto.h>
-extern _X_EXPORT DevPrivateKeyRec GEClientPrivateKeyRec;
+extern DevPrivateKeyRec GEClientPrivateKeyRec;
#define GEClientPrivateKey (&GEClientPrivateKeyRec)
typedef struct _GEClientInfo {
@@ -47,7 +47,7 @@ typedef struct _GEClientInfo {
#define GEGetClient(pClient) ((GEClientInfoPtr)(dixLookupPrivate(&((pClient)->devPrivates), GEClientPrivateKey)))
-extern _X_EXPORT int (*ProcGEVector[/*GENumRequests*/])(ClientPtr);
-extern _X_EXPORT int (*SProcGEVector[/*GENumRequests*/])(ClientPtr);
+extern int (*ProcGEVector[/*GENumRequests*/])(ClientPtr);
+extern int (*SProcGEVector[/*GENumRequests*/])(ClientPtr);
#endif /* _GEINT_H_ */
diff --git a/Xext/panoramiXsrv.h b/Xext/panoramiXsrv.h
index 39d4952..d810235 100644
--- a/Xext/panoramiXsrv.h
+++ b/Xext/panoramiXsrv.h
@@ -8,25 +8,25 @@
#include "panoramiX.h"
-extern _X_EXPORT int PanoramiXNumScreens;
-extern _X_EXPORT int PanoramiXPixWidth;
-extern _X_EXPORT int PanoramiXPixHeight;
+extern int PanoramiXNumScreens;
+extern int PanoramiXPixWidth;
+extern int PanoramiXPixHeight;
-extern _X_EXPORT VisualID PanoramiXTranslateVisualID(int screen, VisualID orig);
-extern _X_EXPORT void PanoramiXConsolidate(void);
-extern _X_EXPORT Bool PanoramiXCreateConnectionBlock(void);
-extern _X_EXPORT PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE, XID, int);
-extern _X_EXPORT Bool XineramaRegisterConnectionBlockCallback(void (*func)(void));
-extern _X_EXPORT int XineramaDeleteResource(pointer, XID);
+extern VisualID PanoramiXTranslateVisualID(int screen, VisualID orig);
+extern void PanoramiXConsolidate(void);
+extern Bool PanoramiXCreateConnectionBlock(void);
+extern PanoramiXRes * PanoramiXFindIDByScrnum(RESTYPE, XID, int);
+extern Bool XineramaRegisterConnectionBlockCallback(void (*func)(void));
+extern int XineramaDeleteResource(pointer, XID);
-extern _X_EXPORT void XineramaReinitData(void);
+extern void XineramaReinitData(void);
-extern _X_EXPORT RESTYPE XRC_DRAWABLE;
-extern _X_EXPORT RESTYPE XRT_WINDOW;
-extern _X_EXPORT RESTYPE XRT_PIXMAP;
-extern _X_EXPORT RESTYPE XRT_GC;
-extern _X_EXPORT RESTYPE XRT_COLORMAP;
-extern _X_EXPORT RESTYPE XRT_PICTURE;
+extern RESTYPE XRC_DRAWABLE;
+extern RESTYPE XRT_WINDOW;
+extern RESTYPE XRT_PIXMAP;
+extern RESTYPE XRT_GC;
+extern RESTYPE XRT_COLORMAP;
+extern RESTYPE XRT_PICTURE;
/*
* Drivers are allowed to wrap this function. Each wrapper can decide that the
diff --git a/Xext/shmint.h b/Xext/shmint.h
index 8f8a00d..bb0eeb8 100644
--- a/Xext/shmint.h
+++ b/Xext/shmint.h
@@ -62,8 +62,8 @@ ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
extern _X_EXPORT void
ShmRegisterFbFuncs(ScreenPtr pScreen);
-extern _X_EXPORT RESTYPE ShmSegType;
-extern _X_EXPORT int ShmCompletionCode;
-extern _X_EXPORT int BadShmSegCode;
+extern RESTYPE ShmSegType;
+extern int ShmCompletionCode;
+extern int BadShmSegCode;
#endif /* _SHMINT_H_ */
diff --git a/Xext/syncsdk.h b/Xext/syncsdk.h
index a72c585..22c8009 100644
--- a/Xext/syncsdk.h
+++ b/Xext/syncsdk.h
@@ -26,7 +26,7 @@
#include "misync.h"
-extern _X_EXPORT int
+extern int
SyncVerifyFence(SyncFence **ppFence, XID fid, ClientPtr client, Mask mode);
#define VERIFY_SYNC_FENCE(pFence, fid, client, mode) \
diff --git a/Xext/xace.h b/Xext/xace.h
index 6029d87..0670c6c 100644
--- a/Xext/xace.h
+++ b/Xext/xace.h
@@ -56,24 +56,24 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define XACE_AUDIT_END 16
#define XACE_NUM_HOOKS 17
-extern _X_EXPORT CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
+extern CallbackListPtr XaceHooks[XACE_NUM_HOOKS];
/* Entry point for hook functions. Called by Xserver.
* Required by libdbe and libextmod
*/
-extern _X_EXPORT int XaceHook(
+extern int XaceHook(
int /*hook*/,
... /*appropriate args for hook*/
);
/* Special-cased hook functions
*/
-extern _X_EXPORT int XaceHookDispatch(ClientPtr ptr, int major);
-extern _X_EXPORT int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin,
- PropertyPtr *ppProp, Mask access_mode);
-extern _X_EXPORT int XaceHookSelectionAccess(ClientPtr ptr,
+extern int XaceHookDispatch(ClientPtr ptr, int major);
+extern int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin,
+ PropertyPtr *ppProp, Mask access_mode);
+extern int XaceHookSelectionAccess(ClientPtr ptr,
Selection **ppSel, Mask access_mode);
-extern _X_EXPORT void XaceHookAuditEnd(ClientPtr ptr, int result);
+extern void XaceHookAuditEnd(ClientPtr ptr, int result);
/* Register a callback for a given hook.
*/
@@ -87,13 +87,13 @@ extern _X_EXPORT void XaceHookAuditEnd(ClientPtr ptr, int result);
/* XTrans wrappers for use by security modules
*/
-extern _X_EXPORT int XaceGetConnectionNumber(ClientPtr ptr);
-extern _X_EXPORT int XaceIsLocal(ClientPtr ptr);
+extern int XaceGetConnectionNumber(ClientPtr ptr);
+extern int XaceIsLocal(ClientPtr ptr);
/* From the original Security extension...
*/
-extern _X_EXPORT void XaceCensorImage(
+extern void XaceCensorImage(
ClientPtr client,
RegionPtr pVisibleRegion,
long widthBytesLine,
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 39921a6..3877698 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -55,20 +55,20 @@ SOFTWARE.
#include "scrnintstr.h"
#include <X11/extensions/Xvproto.h>
-extern _X_EXPORT unsigned long XvExtensionGeneration;
-extern _X_EXPORT unsigned long XvScreenGeneration;
-extern _X_EXPORT unsigned long XvResourceGeneration;
+extern unsigned long XvExtensionGeneration;
+extern unsigned long XvScreenGeneration;
+extern unsigned long XvResourceGeneration;
-extern _X_EXPORT int XvReqCode;
-extern _X_EXPORT int XvEventBase;
-extern _X_EXPORT int XvErrorBase;
+extern int XvReqCode;
+extern int XvEventBase;
+extern int XvErrorBase;
-extern _X_EXPORT RESTYPE XvRTPort;
-extern _X_EXPORT RESTYPE XvRTEncoding;
-extern _X_EXPORT RESTYPE XvRTGrab;
-extern _X_EXPORT RESTYPE XvRTVideoNotify;
-extern _X_EXPORT RESTYPE XvRTVideoNotifyList;
-extern _X_EXPORT RESTYPE XvRTPortNotify;
+extern RESTYPE XvRTPort;
+extern RESTYPE XvRTEncoding;
+extern RESTYPE XvRTGrab;
+extern RESTYPE XvRTVideoNotify;
+extern RESTYPE XvRTVideoNotifyList;
+extern RESTYPE XvRTPortNotify;
typedef struct {
int numerator;
@@ -230,41 +230,41 @@ typedef struct {
#define _XvBadPort (XvBadPort+XvErrorBase)
#define _XvBadEncoding (XvBadEncoding+XvErrorBase)
-extern _X_EXPORT int ProcXvDispatch(ClientPtr);
-extern _X_EXPORT int SProcXvDispatch(ClientPtr);
-
-extern _X_EXPORT int XvScreenInit(ScreenPtr);
-extern _X_EXPORT DevPrivateKey XvGetScreenKey(void);
-extern _X_EXPORT unsigned long XvGetRTPort(void);
-extern _X_EXPORT int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
-extern _X_EXPORT int XvdiVideoStopped(XvPortPtr, int);
-
-extern _X_EXPORT int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
- INT16, INT16, CARD16, CARD16,
- INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
- INT16, INT16, CARD16, CARD16,
- INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
- INT16, INT16, CARD16, CARD16,
- INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
- INT16, INT16, CARD16, CARD16,
- INT16, INT16, CARD16, CARD16);
-extern _X_EXPORT int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
- INT16, INT16, CARD16, CARD16,
- INT16, INT16, CARD16, CARD16,
- XvImagePtr, unsigned char*, Bool,
- CARD16, CARD16);
-extern _X_EXPORT int XvdiSelectVideoNotify(ClientPtr, DrawablePtr, BOOL);
-extern _X_EXPORT int XvdiSelectPortNotify(ClientPtr, XvPortPtr, BOOL);
-extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
-extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32*);
-extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
-extern _X_EXPORT int XvdiPreemptVideo(ClientPtr, XvPortPtr, DrawablePtr);
-extern _X_EXPORT int XvdiMatchPort(XvPortPtr, DrawablePtr);
-extern _X_EXPORT int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);
-extern _X_EXPORT int XvdiUngrabPort( ClientPtr, XvPortPtr, Time);
+extern int ProcXvDispatch(ClientPtr);
+extern int SProcXvDispatch(ClientPtr);
+
+extern int XvScreenInit(ScreenPtr);
+extern DevPrivateKey XvGetScreenKey(void);
+extern unsigned long XvGetRTPort(void);
+extern int XvdiSendPortNotify(XvPortPtr, Atom, INT32);
+extern int XvdiVideoStopped(XvPortPtr, int);
+
+extern int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+ INT16, INT16, CARD16, CARD16,
+ INT16, INT16, CARD16, CARD16);
+extern int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+ INT16, INT16, CARD16, CARD16,
+ INT16, INT16, CARD16, CARD16);
+extern int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+ INT16, INT16, CARD16, CARD16,
+ INT16, INT16, CARD16, CARD16);
+extern int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+ INT16, INT16, CARD16, CARD16,
+ INT16, INT16, CARD16, CARD16);
+extern int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+ INT16, INT16, CARD16, CARD16,
+ INT16, INT16, CARD16, CARD16,
+ XvImagePtr, unsigned char*, Bool,
+ CARD16, CARD16);
+extern int XvdiSelectVideoNotify(ClientPtr, DrawablePtr, BOOL);
+extern int XvdiSelectPortNotify(ClientPtr, XvPortPtr, BOOL);
+extern int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32);
+extern int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32*);
+extern int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr);
+extern int XvdiPreemptVideo(ClientPtr, XvPortPtr, DrawablePtr);
+extern int XvdiMatchPort(XvPortPtr, DrawablePtr);
+extern int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *);
+extern int XvdiUngrabPort( ClientPtr, XvPortPtr, Time);
#endif /* XVDIX_H */
diff --git a/Xext/xvmcext.h b/Xext/xvmcext.h
index 4686b56..da39757 100644
--- a/Xext/xvmcext.h
+++ b/Xext/xvmcext.h
@@ -101,11 +101,11 @@ typedef struct _XvMCAdaptor {
XvMCDestroySubpictureProcPtr DestroySubpicture;
} XvMCAdaptorRec, *XvMCAdaptorPtr;
-extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen,
+extern int XvMCScreenInit(ScreenPtr pScreen,
int num,
XvMCAdaptorPtr adapt);
-extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
+extern XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name,
char *busID, int major, int minor,
diff --git a/include/window.h b/include/window.h
index fea317c..1fe4fad 100644
--- a/include/window.h
+++ b/include/window.h
@@ -249,14 +249,14 @@ extern _X_EXPORT void ResizeChildrenWinSize(
int /*dw*/,
int /*dh*/);
-extern _X_EXPORT void SendShapeNotify(
+extern void SendShapeNotify(
WindowPtr /* pWin */,
int /* which */ );
-extern _X_EXPORT RegionPtr CreateBoundingShape(
+extern RegionPtr CreateBoundingShape(
WindowPtr /* pWin */ );
-extern _X_EXPORT RegionPtr CreateClipShape(
+extern RegionPtr CreateClipShape(
WindowPtr /* pWin */ );
extern _X_EXPORT void DisableMapUnmapEvents(
--
1.7.7.3
More information about the xorg-devel
mailing list