summaryrefslogtreecommitdiff
path: root/Xext/xvdix.h
diff options
context:
space:
mode:
authorPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
committerPaulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>2008-12-03 05:43:34 -0200
commit49f77fff1495c0a2050fb18f9b1fc627839bbfc2 (patch)
treeeebaec908150abfc0159d9ee941404918f553113 /Xext/xvdix.h
parent0b8f8b24f718820a72ebdc52423c2e6a44e848c5 (diff)
Rework symbol visibility for easier maintenance
Save in a few special cases, _X_EXPORT should not be used in C source files. Instead, it should be used in headers, and the proper C source include that header. Some special cases are symbols that need to be shared between modules, but not expected to be used by external drivers, and symbols that are accessible via LoaderSymbol/dlopen. This patch also adds conditionally some new sdk header files, depending on extensions enabled. These files were added to match pattern for other extensions/modules, that is, have the headers "deciding" symbol visibility in the sdk. These headers are: o Xext/panoramiXsrv.h, Xext/panoramiX.h o fbpict.h (unconditionally) o vidmodeproc.h o mioverlay.h (unconditionally, used only by xaa) o xfixes.h (unconditionally, symbols required by dri2) LoaderSymbol and similar functions now don't have different prototypes, in loaderProcs.h and xf86Module.h, so that both headers can be included, without the need of defining IN_LOADER. xf86NewInputDevice() device prototype readded to xf86Xinput.h, but not exported (and with a comment about it).
Diffstat (limited to 'Xext/xvdix.h')
-rw-r--r--Xext/xvdix.h68
1 files changed, 34 insertions, 34 deletions
diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index a516cf113..ee0bf7e4f 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -55,20 +55,20 @@ SOFTWARE.
#include "scrnintstr.h"
#include <X11/extensions/Xvproto.h>
-extern unsigned long XvExtensionGeneration;
-extern unsigned long XvScreenGeneration;
-extern unsigned long XvResourceGeneration;
+extern _X_EXPORT unsigned long XvExtensionGeneration;
+extern _X_EXPORT unsigned long XvScreenGeneration;
+extern _X_EXPORT unsigned long XvResourceGeneration;
-extern int XvReqCode;
-extern int XvEventBase;
-extern int XvErrorBase;
+extern _X_EXPORT int XvReqCode;
+extern _X_EXPORT int XvEventBase;
+extern _X_EXPORT int XvErrorBase;
-extern unsigned long XvRTPort;
-extern unsigned long XvRTEncoding;
-extern unsigned long XvRTGrab;
-extern unsigned long XvRTVideoNotify;
-extern unsigned long XvRTVideoNotifyList;
-extern unsigned long XvRTPortNotify;
+extern _X_EXPORT unsigned long XvRTPort;
+extern _X_EXPORT unsigned long XvRTEncoding;
+extern _X_EXPORT unsigned long XvRTGrab;
+extern _X_EXPORT unsigned long XvRTVideoNotify;
+extern _X_EXPORT unsigned long XvRTVideoNotifyList;
+extern _X_EXPORT unsigned long XvRTPortNotify;
typedef struct {
int numerator;
@@ -234,42 +234,42 @@ typedef struct {
#define _XvBadPort (XvBadPort+XvErrorBase)
#define _XvBadEncoding (XvBadEncoding+XvErrorBase)
-extern int ProcXvDispatch(ClientPtr);
-extern int SProcXvDispatch(ClientPtr);
+extern _X_EXPORT int ProcXvDispatch(ClientPtr);
+extern _X_EXPORT int SProcXvDispatch(ClientPtr);
-extern void XvExtensionInit(void);
-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 _X_EXPORT void XvExtensionInit(void);
+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 int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+extern _X_EXPORT int XvdiPutVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16);
-extern int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+extern _X_EXPORT int XvdiPutStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16);
-extern int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+extern _X_EXPORT int XvdiGetVideo(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16);
-extern int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+extern _X_EXPORT int XvdiGetStill(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
INT16, INT16, CARD16, CARD16,
INT16, INT16, CARD16, CARD16);
-extern int XvdiPutImage(ClientPtr, DrawablePtr, XvPortPtr, GCPtr,
+extern _X_EXPORT 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);
+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);
#if !defined(UNIXCPP)