diff options
| -rw-r--r-- | hw/xfree86/loader/xf86sym.c | 11 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Crtc.c | 54 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Cursors.c | 10 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86DiDGA.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86EdidModes.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Modes.c | 38 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86RandR12.c | 16 | ||||
| -rw-r--r-- | hw/xfree86/modes/xf86Rotate.c | 4 |
8 files changed, 76 insertions, 65 deletions
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index 185eb800b..23f820854 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -1153,9 +1153,12 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86CrtcCreate) SYMFUNC(xf86CrtcDestroy) SYMFUNC(xf86CrtcInUse) + SYMFUNC(xf86CrtcSetScreenSubpixelOrder) + SYMFUNC(xf86RotateCloseScreen) SYMFUNC(xf86CrtcRotate) SYMFUNC(xf86CrtcSetMode) SYMFUNC(xf86CrtcSetSizeRange) + SYMFUNC(xf86CrtcScreenInit) SYMFUNC(xf86CVTMode) SYMFUNC(xf86DisableUnusedFunctions) SYMFUNC(xf86DPMSSet) @@ -1168,18 +1171,25 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86ModesAdd) SYMFUNC(xf86ModesEqual) SYMFUNC(xf86ModeVRefresh) + SYMFUNC(xf86ModeWidth) + SYMFUNC(xf86ModeHeight) SYMFUNC(xf86OutputCreate) SYMFUNC(xf86OutputDestroy) SYMFUNC(xf86OutputGetEDID) + SYMFUNC(xf86ConnectorGetName) SYMFUNC(xf86OutputGetEDIDModes) SYMFUNC(xf86OutputRename) + SYMFUNC(xf86OutputUseScreenMonitor) SYMFUNC(xf86OutputSetEDID) + SYMFUNC(xf86OutputFindClosestMode) SYMFUNC(xf86PrintModeline) SYMFUNC(xf86ProbeOutputModes) SYMFUNC(xf86PruneInvalidModes) SYMFUNC(xf86SetModeCrtc) SYMFUNC(xf86SetModeDefaultName) SYMFUNC(xf86SetScrnInfoModes) + SYMFUNC(xf86SetDesiredModes) + SYMFUNC(xf86SetSingleMode) SYMFUNC(xf86ValidateModesClocks) SYMFUNC(xf86ValidateModesFlags) SYMFUNC(xf86ValidateModesSize) @@ -1197,6 +1207,7 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86RandR12PreInit) SYMFUNC(xf86RandR12SetConfig) SYMFUNC(xf86RandR12SetRotations) + SYMFUNC(xf86RandR12TellChanged) #endif SYMFUNC(xf86_cursors_init) SYMFUNC(xf86_reload_cursors) diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c index 08306bcd7..95b3035dc 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c @@ -53,7 +53,7 @@ int xf86CrtcConfigPrivateIndex = -1; -void +_X_EXPORT void xf86CrtcConfigInit (ScrnInfoPtr scrn, const xf86CrtcConfigFuncsRec *funcs) { @@ -68,7 +68,7 @@ xf86CrtcConfigInit (ScrnInfoPtr scrn, scrn->privates[xf86CrtcConfigPrivateIndex].ptr = config; } -void +_X_EXPORT void xf86CrtcSetSizeRange (ScrnInfoPtr scrn, int minWidth, int minHeight, int maxWidth, int maxHeight) @@ -84,7 +84,7 @@ xf86CrtcSetSizeRange (ScrnInfoPtr scrn, /* * Crtc functions */ -xf86CrtcPtr +_X_EXPORT xf86CrtcPtr xf86CrtcCreate (ScrnInfoPtr scrn, const xf86CrtcFuncsRec *funcs) { @@ -116,7 +116,7 @@ xf86CrtcCreate (ScrnInfoPtr scrn, return crtc; } -void +_X_EXPORT void xf86CrtcDestroy (xf86CrtcPtr crtc) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn); @@ -140,7 +140,7 @@ xf86CrtcDestroy (xf86CrtcPtr crtc) * Return whether any outputs are connected to the specified pipe */ -Bool +_X_EXPORT Bool xf86CrtcInUse (xf86CrtcPtr crtc) { ScrnInfoPtr pScrn = crtc->scrn; @@ -153,7 +153,7 @@ xf86CrtcInUse (xf86CrtcPtr crtc) return FALSE; } -void +_X_EXPORT void xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen) { #ifdef RENDER @@ -221,7 +221,7 @@ xf86CrtcSetScreenSubpixelOrder (ScreenPtr pScreen) /** * Sets the given video mode on the given crtc */ -Bool +_X_EXPORT Bool xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation, int x, int y) { @@ -492,7 +492,7 @@ xf86OutputInitialRotation (xf86OutputPtr output) return RR_Rotate_0; } -xf86OutputPtr +_X_EXPORT xf86OutputPtr xf86OutputCreate (ScrnInfoPtr scrn, const xf86OutputFuncsRec *funcs, const char *name) @@ -552,7 +552,7 @@ xf86OutputCreate (ScrnInfoPtr scrn, return output; } -Bool +_X_EXPORT Bool xf86OutputRename (xf86OutputPtr output, const char *name) { int len = strlen(name) + 1; @@ -571,7 +571,7 @@ xf86OutputRename (xf86OutputPtr output, const char *name) return TRUE; } -void +_X_EXPORT void xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor) { if (use_screen_monitor != output->use_screen_monitor) @@ -581,7 +581,7 @@ xf86OutputUseScreenMonitor (xf86OutputPtr output, Bool use_screen_monitor) } } -void +_X_EXPORT void xf86OutputDestroy (xf86OutputPtr output) { ScrnInfoPtr scrn = output->scrn; @@ -657,7 +657,7 @@ xf86CrtcCloseScreen (int index, ScreenPtr screen) /* * Called at ScreenInit time to set up */ -Bool +_X_EXPORT Bool xf86CrtcScreenInit (ScreenPtr screen) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; @@ -1214,7 +1214,7 @@ xf86SortModes (DisplayModePtr input) return output; } -void +_X_EXPORT void xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -1455,10 +1455,10 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) */ /* XXX where does this function belong? Here? */ -void +_X_EXPORT void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr scrn, int *x, int *y); -void +_X_EXPORT void xf86SetScrnInfoModes (ScrnInfoPtr scrn) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -1526,7 +1526,7 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) * accordingly. */ -Bool +_X_EXPORT Bool xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -1730,7 +1730,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) * modes (used in EnterVT functions, or at server startup) */ -Bool +_X_EXPORT Bool xf86SetDesiredModes (ScrnInfoPtr scrn) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -1810,7 +1810,7 @@ xf86SetDesiredModes (ScrnInfoPtr scrn) * - Closer in refresh rate to the requested mode. */ -DisplayModePtr +_X_EXPORT DisplayModePtr xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired) { DisplayModePtr best = NULL, scan = NULL; @@ -1873,7 +1873,7 @@ xf86OutputFindClosestMode (xf86OutputPtr output, DisplayModePtr desired) * mode across all outputs that are currently active. */ -Bool +_X_EXPORT Bool xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn); @@ -1945,7 +1945,7 @@ xf86SetSingleMode (ScrnInfoPtr pScrn, DisplayModePtr desired, Rotation rotation) * If the new mode is off, it will turn off outputs and then CRTCs. * Otherwise, it will affect CRTCs before outputs. */ -void +_X_EXPORT void xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags) { xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn); @@ -1983,7 +1983,7 @@ xf86DPMSSet(ScrnInfoPtr scrn, int mode, int flags) * Even for monitors with no DPMS support, by the definition of our DPMS hooks, * the outputs will still get disabled (blanked). */ -Bool +_X_EXPORT Bool xf86SaveScreen(ScreenPtr pScreen, int mode) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -1999,7 +1999,7 @@ xf86SaveScreen(ScreenPtr pScreen, int mode) /** * Disable all inactive crtcs and outputs */ -void +_X_EXPORT void xf86DisableUnusedFunctions(ScrnInfoPtr pScrn) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); @@ -2053,7 +2053,7 @@ xf86OutputSetEDIDProperty (xf86OutputPtr output, void *data, int data_len) /** * Set the EDID information for the specified output */ -void +_X_EXPORT void xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon) { ScrnInfoPtr scrn = output->scrn; @@ -2119,7 +2119,7 @@ xf86OutputSetEDID (xf86OutputPtr output, xf86MonPtr edid_mon) * Return the list of modes supported by the EDID information * stored in 'output' */ -DisplayModePtr +_X_EXPORT DisplayModePtr xf86OutputGetEDIDModes (xf86OutputPtr output) { ScrnInfoPtr scrn = output->scrn; @@ -2130,7 +2130,7 @@ xf86OutputGetEDIDModes (xf86OutputPtr output) return xf86DDCGetModes(scrn->scrnIndex, edid_mon); } -xf86MonPtr +_X_EXPORT xf86MonPtr xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus) { ScrnInfoPtr scrn = output->scrn; @@ -2141,7 +2141,7 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus) static char *_xf86ConnectorNames[] = { "None", "VGA", "DVI-I", "DVI-D", "DVI-A", "Composite", "S-Video", "Component", "LFP", "Proprietary" }; -char * +_X_EXPORT char * xf86ConnectorGetName(xf86ConnectorType connector) { return _xf86ConnectorNames[connector]; @@ -2223,7 +2223,7 @@ xf86_covering_crtc(ScrnInfoPtr pScrn, * clip video to that */ -Bool +_X_EXPORT Bool xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn, xf86CrtcPtr *crtc_ret, xf86CrtcPtr desired_crtc, diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c index 92b90a9d4..b5101642b 100644 --- a/hw/xfree86/modes/xf86Cursors.c +++ b/hw/xfree86/modes/xf86Cursors.c @@ -256,7 +256,7 @@ xf86_crtc_hide_cursor (xf86CrtcPtr crtc) } } -void +_X_EXPORT void xf86_hide_cursors (ScrnInfoPtr scrn) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); @@ -282,7 +282,7 @@ xf86_crtc_show_cursor (xf86CrtcPtr crtc) } } -void +_X_EXPORT void xf86_show_cursors (ScrnInfoPtr scrn) { xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); @@ -528,7 +528,7 @@ xf86_load_cursor_argb (ScrnInfoPtr scrn, CursorPtr cursor) } } -Bool +_X_EXPORT Bool xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; @@ -579,7 +579,7 @@ xf86_cursors_init (ScreenPtr screen, int max_width, int max_height, int flags) * Reloads cursor images as needed, then adjusts cursor positions */ -void +_X_EXPORT void xf86_reload_cursors (ScreenPtr screen) { ScrnInfoPtr scrn; @@ -622,7 +622,7 @@ xf86_reload_cursors (ScreenPtr screen) /** * Clean up CRTC-based cursor code */ -void +_X_EXPORT void xf86_cursors_fini (ScreenPtr screen) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c index 0964cefa7..f40d0abef 100644 --- a/hw/xfree86/modes/xf86DiDGA.c +++ b/hw/xfree86/modes/xf86DiDGA.c @@ -255,7 +255,7 @@ static DGAFunctionRec xf86_dga_funcs = { NULL }; -Bool +_X_EXPORT Bool xf86DiDGAReInit (ScreenPtr pScreen) { ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; @@ -267,7 +267,7 @@ xf86DiDGAReInit (ScreenPtr pScreen) return DGAReInitModes (pScreen, xf86_config->dga_modes, xf86_config->dga_nmode); } -Bool +_X_EXPORT Bool xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address) { ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; diff --git a/hw/xfree86/modes/xf86EdidModes.c b/hw/xfree86/modes/xf86EdidModes.c index 908593bdc..8b5e69d9a 100644 --- a/hw/xfree86/modes/xf86EdidModes.c +++ b/hw/xfree86/modes/xf86EdidModes.c @@ -303,7 +303,7 @@ DDCGuessRangesFromModes(int scrnIndex, MonPtr Monitor, DisplayModePtr Modes) } } -DisplayModePtr +_X_EXPORT DisplayModePtr xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC) { int preferred, i; @@ -389,7 +389,7 @@ xf86DDCGetModes(int scrnIndex, xf86MonPtr DDC) /* * Fill out MonPtr with xf86MonPtr information. */ -void +_X_EXPORT void xf86DDCMonitorSet(int scrnIndex, MonPtr Monitor, xf86MonPtr DDC) { DisplayModePtr Modes = NULL, Mode; diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c index ea9f85baa..f49c2921c 100644 --- a/hw/xfree86/modes/xf86Modes.c +++ b/hw/xfree86/modes/xf86Modes.c @@ -49,7 +49,7 @@ extern XF86ConfigPtr xf86configptr; * * Exact copy of xf86Mode.c's. */ -double +_X_EXPORT double xf86ModeHSync(DisplayModePtr mode) { double hsync = 0.0; @@ -67,7 +67,7 @@ xf86ModeHSync(DisplayModePtr mode) * * Exact copy of xf86Mode.c's. */ -double +_X_EXPORT double xf86ModeVRefresh(DisplayModePtr mode) { double refresh = 0.0; @@ -86,7 +86,7 @@ xf86ModeVRefresh(DisplayModePtr mode) return refresh; } -int +_X_EXPORT int xf86ModeWidth (DisplayModePtr mode, Rotation rotation) { switch (rotation & 0xf) { @@ -101,7 +101,7 @@ xf86ModeWidth (DisplayModePtr mode, Rotation rotation) } } -int +_X_EXPORT int xf86ModeHeight (DisplayModePtr mode, Rotation rotation) { switch (rotation & 0xf) { @@ -117,7 +117,7 @@ xf86ModeHeight (DisplayModePtr mode, Rotation rotation) } /** Sets a default mode name of <width>x<height> on a mode. */ -void +_X_EXPORT void xf86SetModeDefaultName(DisplayModePtr mode) { if (mode->name != NULL) @@ -134,7 +134,7 @@ xf86SetModeDefaultName(DisplayModePtr mode) * * Exact copy of xf86Mode.c's. */ -void +_X_EXPORT void xf86SetModeCrtc(DisplayModePtr p, int adjustFlags) { if ((p == NULL) || ((p->type & M_T_CRTC_C) == M_T_BUILTIN)) @@ -185,7 +185,7 @@ xf86SetModeCrtc(DisplayModePtr p, int adjustFlags) /** * Allocates and returns a copy of pMode, including pointers within pMode. */ -DisplayModePtr +_X_EXPORT DisplayModePtr xf86DuplicateMode(DisplayModePtr pMode) { DisplayModePtr pNew; @@ -209,7 +209,7 @@ xf86DuplicateMode(DisplayModePtr pMode) * * \param modeList doubly-linked mode list */ -DisplayModePtr +_X_EXPORT DisplayModePtr xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList) { DisplayModePtr first = NULL, last = NULL; @@ -243,7 +243,7 @@ xf86DuplicateModes(ScrnInfoPtr pScrn, DisplayModePtr modeList) * * This isn't in xf86Modes.c, but it might deserve to be there. */ -Bool +_X_EXPORT Bool xf86ModesEqual(DisplayModePtr pMode1, DisplayModePtr pMode2) { if (pMode1->Clock == pMode2->Clock && @@ -279,7 +279,7 @@ add(char **p, char *new) * * Convenient VRefresh printing was added, though, compared to xf86Mode.c */ -void +_X_EXPORT void xf86PrintModeline(int scrnIndex,DisplayModePtr mode) { char tmp[256]; @@ -327,7 +327,7 @@ xf86PrintModeline(int scrnIndex,DisplayModePtr mode) * * This is not in xf86Modes.c, but would be part of the proposed new API. */ -void +_X_EXPORT void xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, int flags) { @@ -348,7 +348,7 @@ xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList, * * This is not in xf86Modes.c, but would be part of the proposed new API. */ -void +_X_EXPORT void xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList, int maxX, int maxY, int maxPitch) { @@ -377,7 +377,7 @@ xf86ValidateModesSize(ScrnInfoPtr pScrn, DisplayModePtr modeList, * * This is not in xf86Modes.c, but would be part of the proposed new API. */ -void +_X_EXPORT void xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList, MonPtr mon) { @@ -424,7 +424,7 @@ xf86ValidateModesSync(ScrnInfoPtr pScrn, DisplayModePtr modeList, * * This is not in xf86Modes.c, but would be part of the proposed new API. */ -void +_X_EXPORT void xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList, int *min, int *max, int n_ranges) { @@ -458,7 +458,7 @@ xf86ValidateModesClocks(ScrnInfoPtr pScrn, DisplayModePtr modeList, * * This is not in xf86Modes.c, but would be part of the proposed new API. */ -void +_X_EXPORT void xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList) { DisplayModePtr mode; @@ -492,7 +492,7 @@ xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList) * * This is not in xf86Modes.c, but would be part of the proposed new API. */ -void +_X_EXPORT void xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList, Bool verbose) { @@ -526,7 +526,7 @@ xf86PruneInvalidModes(ScrnInfoPtr pScrn, DisplayModePtr *modeList, * * \param modes doubly-linked mode list. */ -DisplayModePtr +_X_EXPORT DisplayModePtr xf86ModesAdd(DisplayModePtr modes, DisplayModePtr new) { if (modes == NULL) @@ -592,7 +592,7 @@ xf86GetConfigModes (XF86ConfModeLinePtr conf_mode) /** * Build a mode list from a monitor configuration */ -DisplayModePtr +_X_EXPORT DisplayModePtr xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor) { DisplayModePtr modes = NULL; @@ -624,7 +624,7 @@ xf86GetMonitorModes (ScrnInfoPtr pScrn, XF86ConfMonitorPtr conf_monitor) /** * Build a mode list containing all of the default modes */ -DisplayModePtr +_X_EXPORT DisplayModePtr xf86GetDefaultModes (Bool interlaceAllowed, Bool doubleScanAllowed) { DisplayModePtr head = NULL, prev = NULL, mode; diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c index ae0a2cebf..38435c924 100644 --- a/hw/xfree86/modes/xf86RandR12.c +++ b/hw/xfree86/modes/xf86RandR12.c @@ -244,7 +244,7 @@ xf86RandR12SetMode (ScreenPtr pScreen, return ret; } -Bool +_X_EXPORT Bool xf86RandR12SetConfig (ScreenPtr pScreen, Rotation rotation, int rate, @@ -372,7 +372,7 @@ finish: return ret; } -Rotation +_X_EXPORT Rotation xf86RandR12GetRotation(ScreenPtr pScreen) { XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); @@ -380,7 +380,7 @@ xf86RandR12GetRotation(ScreenPtr pScreen) return randrp->rotation; } -Bool +_X_EXPORT Bool xf86RandR12CreateScreenResources (ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -470,7 +470,7 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen) } -Bool +_X_EXPORT Bool xf86RandR12Init (ScreenPtr pScreen) { rrScrPrivPtr rp; @@ -520,7 +520,7 @@ xf86RandR12Init (ScreenPtr pScreen) return TRUE; } -void +_X_EXPORT void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations) { XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); @@ -538,7 +538,7 @@ xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations) randrp->supported_rotations = rotations; } -void +_X_EXPORT void xf86RandR12GetOriginalVirtualSize(ScrnInfoPtr pScrn, int *x, int *y) { ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex]; @@ -1072,7 +1072,7 @@ xf86RandR12CreateScreenResources12 (ScreenPtr pScreen) * to DGA, VidMode or hot key. Tell RandR */ -void +_X_EXPORT void xf86RandR12TellChanged (ScreenPtr pScreen) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; @@ -1122,7 +1122,7 @@ xf86RandR12Init12 (ScreenPtr pScreen) #endif -Bool +_X_EXPORT Bool xf86RandR12PreInit (ScrnInfoPtr pScrn) { return TRUE; diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index 4016b9733..380478f7f 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -478,7 +478,7 @@ xf86RotateDestroy (xf86CrtcPtr crtc) } } -void +_X_EXPORT void xf86RotateCloseScreen (ScreenPtr screen) { ScrnInfoPtr scrn = xf86Screens[screen->myNum]; @@ -489,7 +489,7 @@ xf86RotateCloseScreen (ScreenPtr screen) xf86RotateDestroy (xf86_config->crtc[c]); } -Bool +_X_EXPORT Bool xf86CrtcRotate (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation) { ScrnInfoPtr pScrn = crtc->scrn; |