[PATCH 20/31] XFree86: Extensions: _X_UNEXPORT
Daniel Stone
daniel at fooishbar.org
Fri Dec 2 03:31:26 PST 2011
Remove _X_EXPORT tags from functions not used by any drivers.
Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
hw/xfree86/common/dgaproc.h | 54 ++++++++++++++++++------------------
hw/xfree86/common/vidmodeproc.h | 58 +++++++++++++++++++-------------------
hw/xfree86/common/xf86.h | 8 +++---
3 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/hw/xfree86/common/dgaproc.h b/hw/xfree86/common/dgaproc.h
index 111d46b..7e21da9 100644
--- a/hw/xfree86/common/dgaproc.h
+++ b/hw/xfree86/common/dgaproc.h
@@ -54,7 +54,7 @@ typedef struct {
/* DDX interface */
-extern _X_EXPORT int
+extern int
DGASetMode(
int Index,
int num,
@@ -62,35 +62,35 @@ DGASetMode(
PixmapPtr *pPix
);
-extern _X_EXPORT void
+extern void
DGASetInputMode(
int Index,
Bool keyboard,
Bool mouse
);
-extern _X_EXPORT void
+extern void
DGASelectInput(
int Index,
ClientPtr client,
long mask
);
-extern _X_EXPORT Bool DGAAvailable(int Index);
-extern _X_EXPORT Bool DGAActive(int Index);
-extern _X_EXPORT void DGAShutdown(void);
-extern _X_EXPORT void DGAInstallCmap(ColormapPtr cmap);
-extern _X_EXPORT int DGAGetViewportStatus(int Index);
-extern _X_EXPORT int DGASync(int Index);
+extern Bool DGAAvailable(int Index);
+extern Bool DGAActive(int Index);
+extern void DGAShutdown(void);
+extern void DGAInstallCmap(ColormapPtr cmap);
+extern int DGAGetViewportStatus(int Index);
+extern int DGASync(int Index);
-extern _X_EXPORT int
+extern int
DGAFillRect(
int Index,
int x, int y, int w, int h,
unsigned long color
);
-extern _X_EXPORT int
+extern int
DGABlitRect(
int Index,
int srcx, int srcy,
@@ -98,7 +98,7 @@ DGABlitRect(
int dstx, int dsty
);
-extern _X_EXPORT int
+extern int
DGABlitTransRect(
int Index,
int srcx, int srcy,
@@ -107,34 +107,34 @@ DGABlitTransRect(
unsigned long color
);
-extern _X_EXPORT int
+extern int
DGASetViewport(
int Index,
int x, int y,
int mode
);
-extern _X_EXPORT int DGAGetModes(int Index);
-extern _X_EXPORT int DGAGetOldDGAMode(int Index);
+extern int DGAGetModes(int Index);
+extern int DGAGetOldDGAMode(int Index);
-extern _X_EXPORT int DGAGetModeInfo(int Index, XDGAModePtr mode, int num);
+extern int DGAGetModeInfo(int Index, XDGAModePtr mode, int num);
-extern _X_EXPORT Bool DGAVTSwitch(void);
-extern _X_EXPORT Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index, int button,
+extern Bool DGAVTSwitch(void);
+extern Bool DGAStealButtonEvent(DeviceIntPtr dev, int Index, int button,
int is_down);
-extern _X_EXPORT Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy);
-extern _X_EXPORT Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index, int key_code, int is_down);
+extern Bool DGAStealMotionEvent(DeviceIntPtr dev, int Index, int dx, int dy);
+extern Bool DGAStealKeyEvent(DeviceIntPtr dev, int Index, int key_code, int is_down);
-extern _X_EXPORT Bool DGAOpenFramebuffer(int Index, char **name, unsigned char **mem,
+extern Bool DGAOpenFramebuffer(int Index, char **name, unsigned char **mem,
int *size, int *offset, int *flags);
-extern _X_EXPORT void DGACloseFramebuffer(int Index);
-extern _X_EXPORT Bool DGAChangePixmapMode(int Index, int *x, int *y, int mode);
-extern _X_EXPORT int DGACreateColormap(int Index, ClientPtr client, int id, int mode,
+extern void DGACloseFramebuffer(int Index);
+extern Bool DGAChangePixmapMode(int Index, int *x, int *y, int mode);
+extern int DGACreateColormap(int Index, ClientPtr client, int id, int mode,
int alloc);
-extern _X_EXPORT unsigned char DGAReqCode;
-extern _X_EXPORT int DGAErrorBase;
-extern _X_EXPORT int DGAEventBase;
+extern unsigned char DGAReqCode;
+extern int DGAErrorBase;
+extern int DGAEventBase;
diff --git a/hw/xfree86/common/vidmodeproc.h b/hw/xfree86/common/vidmodeproc.h
index 35e9d8b..6f03dd2 100644
--- a/hw/xfree86/common/vidmodeproc.h
+++ b/hw/xfree86/common/vidmodeproc.h
@@ -42,35 +42,35 @@ typedef union {
extern Bool VidModeExtensionInit(ScreenPtr pScreen);
-extern _X_EXPORT Bool VidModeAvailable(int scrnIndex);
-extern _X_EXPORT Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock);
-extern _X_EXPORT Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock);
-extern _X_EXPORT Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock);
-extern _X_EXPORT Bool VidModeDeleteModeline(int scrnIndex, pointer mode);
-extern _X_EXPORT Bool VidModeZoomViewport(int scrnIndex, int zoom);
-extern _X_EXPORT Bool VidModeGetViewPort(int scrnIndex, int *x, int *y);
-extern _X_EXPORT Bool VidModeSetViewPort(int scrnIndex, int x, int y);
-extern _X_EXPORT Bool VidModeSwitchMode(int scrnIndex, pointer mode);
-extern _X_EXPORT Bool VidModeLockZoom(int scrnIndex, Bool lock);
-extern _X_EXPORT Bool VidModeGetMonitor(int scrnIndex, pointer *monitor);
-extern _X_EXPORT int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock);
-extern _X_EXPORT Bool VidModeGetClocks(int scrnIndex, int *Clocks);
-extern _X_EXPORT ModeStatus VidModeCheckModeForMonitor(int scrnIndex, pointer mode);
-extern _X_EXPORT ModeStatus VidModeCheckModeForDriver(int scrnIndex, pointer mode);
-extern _X_EXPORT void VidModeSetCrtcForMode(int scrnIndex, pointer mode);
-extern _X_EXPORT Bool VidModeAddModeline(int scrnIndex, pointer mode);
-extern _X_EXPORT int VidModeGetDotClock(int scrnIndex, int Clock);
-extern _X_EXPORT int VidModeGetNumOfModes(int scrnIndex);
-extern _X_EXPORT Bool VidModeSetGamma(int scrnIndex, float red, float green, float blue);
-extern _X_EXPORT Bool VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue);
-extern _X_EXPORT pointer VidModeCreateMode(void);
-extern _X_EXPORT void VidModeCopyMode(pointer modefrom, pointer modeto);
-extern _X_EXPORT int VidModeGetModeValue(pointer mode, int valtyp);
-extern _X_EXPORT void VidModeSetModeValue(pointer mode, int valtyp, int val);
-extern _X_EXPORT vidMonitorValue VidModeGetMonitorValue(pointer monitor, int valtyp, int indx);
-extern _X_EXPORT Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *);
-extern _X_EXPORT Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *);
-extern _X_EXPORT int VidModeGetGammaRampSize(int scrnIndex);
+extern Bool VidModeAvailable(int scrnIndex);
+extern Bool VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock);
+extern Bool VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock);
+extern Bool VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock);
+extern Bool VidModeDeleteModeline(int scrnIndex, pointer mode);
+extern Bool VidModeZoomViewport(int scrnIndex, int zoom);
+extern Bool VidModeGetViewPort(int scrnIndex, int *x, int *y);
+extern Bool VidModeSetViewPort(int scrnIndex, int x, int y);
+extern Bool VidModeSwitchMode(int scrnIndex, pointer mode);
+extern Bool VidModeLockZoom(int scrnIndex, Bool lock);
+extern Bool VidModeGetMonitor(int scrnIndex, pointer *monitor);
+extern int VidModeGetNumOfClocks(int scrnIndex, Bool *progClock);
+extern Bool VidModeGetClocks(int scrnIndex, int *Clocks);
+extern ModeStatus VidModeCheckModeForMonitor(int scrnIndex, pointer mode);
+extern ModeStatus VidModeCheckModeForDriver(int scrnIndex, pointer mode);
+extern void VidModeSetCrtcForMode(int scrnIndex, pointer mode);
+extern Bool VidModeAddModeline(int scrnIndex, pointer mode);
+extern int VidModeGetDotClock(int scrnIndex, int Clock);
+extern int VidModeGetNumOfModes(int scrnIndex);
+extern Bool VidModeSetGamma(int scrnIndex, float red, float green, float blue);
+extern Bool VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue);
+extern pointer VidModeCreateMode(void);
+extern void VidModeCopyMode(pointer modefrom, pointer modeto);
+extern int VidModeGetModeValue(pointer mode, int valtyp);
+extern void VidModeSetModeValue(pointer mode, int valtyp, int val);
+extern vidMonitorValue VidModeGetMonitorValue(pointer monitor, int valtyp, int indx);
+extern Bool VidModeSetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *);
+extern Bool VidModeGetGammaRamp(int, int, CARD16 *, CARD16 *, CARD16 *);
+extern int VidModeGetGammaRampSize(int scrnIndex);
#endif
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index 1af4fa9..906d878 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -182,8 +182,8 @@ extern _X_EXPORT DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VR
extern _X_EXPORT Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags);
#ifdef DPMSExtension
-extern _X_EXPORT int DPMSSet(ClientPtr client, int level);
-extern _X_EXPORT Bool DPMSSupported(void);
+extern int DPMSSet(ClientPtr client, int level);
+extern Bool DPMSSupported(void);
#endif
@@ -192,8 +192,8 @@ extern _X_EXPORT Bool DPMSSupported(void);
#ifdef XFreeXDGA
extern _X_EXPORT Bool DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes,
int num);
-extern _X_EXPORT Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num);
-extern _X_EXPORT xf86SetDGAModeProc xf86SetDGAMode;
+extern Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num);
+extern xf86SetDGAModeProc xf86SetDGAMode;
#endif
/* xf86Events.c */
--
1.7.7.3
More information about the xorg-devel
mailing list