diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-29 23:56:06 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2008-11-29 23:56:06 -0200 |
| commit | d6cbd4511e35a89a0353f11834c6fdb8d4d2189f (patch) | |
| tree | e9ffd8f4060fb6ffd2dc80d4f936fe7d910e22e5 /hw/xfree86 | |
| parent | ffb484f7ef84099019b196ef97bfb2355eb6d52a (diff) | |
Export symbols defined in the sdk.
This is the biggest "visibility" patch. Instead of doing a "export"
symbol on demand, export everything in the sdk, so that if some module
fails due to an unresolved symbol, it is because it is using a symbol
not in the sdk.
Most exported symbols shouldn't really be made visible, neither
advertised in the sdk, as they are only used by a single shared object.
Symbols in the sdk (or referenced in sdk macros), but not defined
anywhere include:
XkbBuildCoreState()
XkbInitialMap
XkbXIUnsupported
XkbCheckActionVMods()
XkbSendCompatNotify()
XkbDDXFakePointerButton()
XkbDDXApplyConfig()
_XkbStrCaseCmp()
_XkbErrMessages[]
_XkbErrCode
_XkbErrLocation
_XkbErrData
XkbAccessXDetailText()
XkbNKNDetailMaskText()
XkbLookupGroupAndLevel()
XkbInitAtoms()
XkbGetOrderedDrawables()
XkbFreeOrderedDrawables()
XkbConvertXkbComponents()
XkbWriteXKBSemantics()
XkbWriteXKBLayout()
XkbWriteXKBKeymap()
XkbWriteXKBFile()
XkbWriteCFile()
XkbWriteXKMFile()
XkbWriteToServer()
XkbMergeFile()
XkmFindTOCEntry()
XkmReadFileSection()
XkmReadFileSectionName()
InitExtInput()
xf86CheckButton()
xf86SwitchCoreDevice()
RamDacSetGamma()
RamDacRestoreDACValues()
xf86Bpp
xf86ConfigPix24
xf86MouseCflags[]
xf86SupportedMouseTypes[]
xf86NumMouseTypes
xf86ChangeBusIndex()
xf86EntityEnter()
xf86EntityLeave()
xf86WrapperInit()
xf86RingBell()
xf86findOptionBoolean()
xf86debugListOptions()
LoadSubModuleLocal()
LoaderSymbolLocal()
getInt10Rec()
xf86CurrentScreen
xf86ReallocatePciResources()
xf86NewSerialNumber()
xf86RandRSetInitialMode()
fbCompositeSolidMask_nx1xn
fbCompositeSolidMask_nx8888x0565C
fbCompositeSolidMask_nx8888x8888C
fbCompositeSolidMask_nx8x0565
fbCompositeSolidMask_nx8x0888
fbCompositeSolidMask_nx8x8888
fbCompositeSrc_0565x0565
fbCompositeSrc_8888x0565
fbCompositeSrc_8888x0888
fbCompositeSrc_8888x8888
fbCompositeSrcAdd_1000x1000
fbCompositeSrcAdd_8000x8000
fbCompositeSrcAdd_8888x8888
fbGeneration
fbIn
fbOver
fbOver24
fbOverlayGeneration
fbRasterizeEdges
fbRestoreAreas
fbSaveAreas
composeFunctions
VBEBuildVbeModeList()
VBECalcVbeModeIndex()
TIramdac3030CalculateMNPForClock()
shadowBufPtr
shadowFindBuf()
miRRGetScreenInfo()
RRSetScreenConfig()
RRModePruneUnused()
PixmanImageFromPicture()
extern int miPointerGetMotionEvents()
miClipPicture()
miRasterizeTriangle()
fbPush1toN()
fbInitializeBackingStore()
ddxBeforeReset()
SetupSprite()
InitSprite()
DGADeliverEvent()
SPECIAL CASES
o defined as _X_INTERNAL
xf86NewInputDevice()
o defined as static
fbGCPrivateKey
fbOverlayScreenPrivateKey
fbScreenPrivateKey
fbWinPrivateKey
o defined in libXfont.so, but declared in xorg/dixfont.h
GetGlyphs()
QueryGlyphExtents()
QueryTextExtents()
ParseGlyphCachingMode()
InitGlyphCaching()
SetGlyphCachingMode()
Diffstat (limited to 'hw/xfree86')
119 files changed, 504 insertions, 499 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 3236b5a4f..214609e53 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -64,7 +64,7 @@ noopEnableDisable(void *arg) { } xf86AccessRec AccessNULL = { noopEnableDisable, noopEnableDisable, NULL }; -xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL}; +_X_EXPORT xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL}; BusRec primaryBus = { BUS_NONE, {{0}}}; @@ -100,7 +100,7 @@ static void notifyStateChange(xf86NotifyState state); * The only one available so far is for PCI and SBUS. */ -void +_X_EXPORT void xf86BusProbe(void) { xf86PciProbe(); @@ -148,7 +148,7 @@ StringToBusType(const char* busID, const char **retID) * Entity related code. */ -void +_X_EXPORT void xf86EntityInit(void) { int i; @@ -231,7 +231,7 @@ xf86IsEntityPrimary(int entityIndex) } } -Bool +_X_EXPORT Bool xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter, EntityProc leave, pointer private) { @@ -244,7 +244,7 @@ xf86SetEntityFuncs(int entityIndex, EntityProc init, EntityProc enter, return TRUE; } -Bool +_X_EXPORT Bool xf86DriverHasEntities(DriverPtr drvp) { int i; @@ -348,7 +348,7 @@ xf86RemoveEntityFromScreen(ScrnInfoPtr pScrn, int entityIndex) * xf86ClearEntitiesForScreen() - called when a screen is deleted * to mark it's entities unused. Called by xf86DeleteScreen(). */ -void +_X_EXPORT void xf86ClearEntityListForScreen(int scrnIndex) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -380,7 +380,7 @@ xf86ClearEntityListForScreen(int scrnIndex) pScrn->entityInstanceList = NULL; } -void +_X_EXPORT void xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type) { resPtr *pprev_next = &Acc; @@ -402,7 +402,7 @@ xf86DeallocateResourcesForEntity(int entityIndex, unsigned long type) * Add an extra device section (GDevPtr) to an entity. */ -void +_X_EXPORT void xf86AddDevToEntity(int entityIndex, GDevPtr dev) { EntityPtr pEnt; @@ -539,7 +539,7 @@ clearAccess(void) * xf86AccessInit() - set up everything needed for access control * called only once on first server generation. */ -void +_X_EXPORT void xf86AccessInit(void) { initPciState(); @@ -554,7 +554,7 @@ xf86AccessInit(void) * xf86AccessEnter() -- gets called to save the text mode VGA IO * resources when reentering the server after a VT switch. */ -void +_X_EXPORT void xf86AccessEnter(void) { if (xf86ResAccessEnter) @@ -583,7 +583,7 @@ xf86AccessEnter(void) * This was split to call xf86AccessLeaveState() from * ddxGiveUp(). */ -void +_X_EXPORT void xf86AccessLeave(void) { if (!xf86ResAccessEnter) @@ -594,7 +594,7 @@ xf86AccessLeave(void) EntityLeave(); } -void +_X_EXPORT void xf86AccessLeaveState(void) { if (!xf86ResAccessEnter) @@ -1098,7 +1098,7 @@ xf86JoinResLists(resPtr rlist1, resPtr rlist2) return rlist1; } -resPtr +_X_EXPORT resPtr xf86AddResToList(resPtr rlist, resRange *range, int entityIndex) { resPtr new; @@ -1264,7 +1264,7 @@ xf86PrintResList(int verb, resPtr list) } } -resPtr +_X_EXPORT resPtr xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex) { while(pRange && pRange->type != ResEnd) { @@ -1274,7 +1274,7 @@ xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex) return list; } -void +_X_EXPORT void xf86ResourceBrokerInit(void) { Acc = NULL; @@ -1540,7 +1540,7 @@ SetSIGIOForState(xf86State state) } } -void +_X_EXPORT void xf86EnterServerState(xf86State state) { EntityPtr pEnt; @@ -1817,7 +1817,7 @@ checkRoutingForScreens(xf86State state) * xf86PostProbe() -- Allocate all non conflicting resources * This function gets called by xf86Init(). */ -void +_X_EXPORT void xf86PostProbe(void) { memType val; @@ -1931,7 +1931,7 @@ checkRequiredResources(int entityIndex) pEnt->entityProp &= ~(unsigned long)NEED_IO_SHARED; } -void +_X_EXPORT void xf86PostPreInit() { if (doFramebufferMode) return; @@ -1951,7 +1951,7 @@ xf86PostPreInit() xf86PrintResList(3, Acc); } -void +_X_EXPORT void xf86PostScreenInit(void) { int i,j; @@ -2300,7 +2300,7 @@ findIntersect(resRange Range, resPtr list) return new; } -resPtr +_X_EXPORT resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2) { resPtr ret = NULL; @@ -2365,7 +2365,7 @@ xf86ExtractTypeFromList(resPtr list, unsigned long type) * xf86FindPrimaryDevice() - Find the display device which * was active when the server was started. */ -void +_X_EXPORT void xf86FindPrimaryDevice() { if (primaryBus.type != BUS_NONE) { @@ -2394,7 +2394,7 @@ xf86FindPrimaryDevice() } } -Bool +_X_EXPORT Bool xf86NoSharedResources(int screenIndex,resType res) { int j; diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index a6290a7fa..d2d447e7d 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1136,7 +1136,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) return TRUE; } -Bool xf86DRI2Enabled(void) +_X_EXPORT Bool xf86DRI2Enabled(void) { return xf86Info.dri2; } @@ -2626,7 +2626,7 @@ xf86HandleConfigFile(Bool autoconfig) return CONFIG_OK; } -Bool +_X_EXPORT Bool xf86PathIsSafe(const char *path) { return (xf86pathIsSafe(path) != 0); diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 87004966a..819ad9587 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -68,7 +68,7 @@ static DevToConfigPtr DevToConfig = NULL; static int nDevToConfig = 0, CurrentDriver; _X_EXPORT xf86MonPtr ConfiguredMonitor; -Bool xf86DoConfigurePass1 = TRUE; +_X_EXPORT Bool xf86DoConfigurePass1 = TRUE; static Bool foundMouse = FALSE; #if defined(__SCO__) @@ -92,7 +92,7 @@ static char *DFLT_MOUSE_PROTO = "auto"; * directly. We allocate a GDevRec and fill it in as much as we can, letting * the caller fill in the rest and/or change it as it sees fit. */ -GDevPtr +_X_EXPORT GDevPtr xf86AddBusDeviceToConfigure(const char *driver, BusType bus, void *busData, int chipset) { int i, j; @@ -639,7 +639,7 @@ configureDDCMonitorSection (int screennum) # define PATH_MAX 1024 #endif -void +_X_EXPORT void DoConfigure(void) { int i,j, screennum = -1; diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index 4336ca502..f7a469f9a 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -89,7 +89,7 @@ static Bool HardEdges; * is valid if specified. */ -void +_X_EXPORT void xf86InitViewport(ScrnInfoPtr pScr) { @@ -185,7 +185,7 @@ xf86PointerMoved(int scrnIndex, int x, int y) * Enable/disable ZoomViewport */ -void +_X_EXPORT void xf86LockZoom(ScreenPtr pScreen, Bool lock) { XF86SCRNINFO(pScreen)->zoomLocked = lock; @@ -322,7 +322,7 @@ xf86SwitchMode(ScreenPtr pScreen, DisplayModePtr mode) * Reinitialize the visual part of the screen for another mode. */ -void +_X_EXPORT void xf86ZoomViewport(ScreenPtr pScreen, int zoom) { ScrnInfoPtr pScr = XF86SCRNINFO(pScreen); @@ -579,7 +579,7 @@ FillOutEdge(xf86EdgePtr pEdge, int limit) * on 32 bit architectures, 64 on 64 bit architectures. */ -void +_X_EXPORT void xf86InitOrigins(void) { unsigned long screensLeft, prevScreensLeft, mask; diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index a06f285f1..f378c1399 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -334,7 +334,7 @@ DGAUninstallColormap(ColormapPtr pmap) pScreen->UninstallColormap = DGAUninstallColormap; } -int +_X_EXPORT int xf86SetDGAMode( int index, int num, @@ -567,7 +567,7 @@ DGAActive(int index) /* Called by the event code in case the server is abruptly terminated */ -void +_X_EXPORT void DGAShutdown() { ScrnInfoPtr pScrn; @@ -892,7 +892,7 @@ DGACopyModeInfo( } -Bool +_X_EXPORT Bool DGAVTSwitch(void) { ScreenPtr pScreen; @@ -914,7 +914,7 @@ DGAVTSwitch(void) return TRUE; } -Bool +_X_EXPORT Bool DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down) { DGAScreenPtr pScreenPriv; @@ -941,7 +941,7 @@ DGAStealKeyEvent(DeviceIntPtr dev, int index, int key_code, int is_down) static int DGAMouseX, DGAMouseY; -Bool +_X_EXPORT Bool DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy) { DGAScreenPtr pScreenPriv; @@ -976,7 +976,7 @@ DGAStealMotionEvent(DeviceIntPtr dev, int index, int dx, int dy) return TRUE; } -Bool +_X_EXPORT Bool DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down) { DGAScreenPtr pScreenPriv; @@ -1004,7 +1004,7 @@ DGAStealButtonEvent(DeviceIntPtr dev, int index, int button, int is_down) /* We have the power to steal or modify events that are about to get queued */ -Bool +_X_EXPORT Bool DGAIsDgaEvent (xEvent *e) { int coreEquiv; diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 0ddee4bc8..aec43e61e 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -130,7 +130,7 @@ typedef struct x_IHRec { static IHPtr InputHandlers = NULL; -Bool +_X_EXPORT Bool LegalModifier(unsigned int key, DeviceIntPtr pDev) { return TRUE; @@ -141,7 +141,7 @@ LegalModifier(unsigned int key, DeviceIntPtr pDev) * Function used for screensaver purposes by the os module. Returns the * time in milliseconds since there last was any input. */ -int +_X_EXPORT int TimeSinceLastInputEvent() { if (xf86Info.lastEventTime == 0) { @@ -166,7 +166,7 @@ SetTimeSinceLastInputEvent() * correct chronological order. Only reads from the system pointer * and keyboard. */ -void +_X_EXPORT void ProcessInputEvents () { int x, y; @@ -251,7 +251,7 @@ xf86ProcessActionEvent(ActionEvent action, void *arg) */ /* ARGSUSED */ -void +_X_EXPORT void xf86Wakeup(pointer blockData, int err, pointer pReadmask) { fd_set* LastSelectMask = (fd_set*)pReadmask; @@ -359,7 +359,7 @@ xf86InterceptSigIll(void (*sigillhandler)(void)) * xf86SigHandler -- * Catch unexpected signals and exit or continue cleanly. */ -void +_X_EXPORT void xf86SigHandler(int signo) { if ((signo == SIGILL) && xf86SigIllHandler) { @@ -802,7 +802,7 @@ xf86EnableVTSwitch(Bool new) return old; } -void +_X_EXPORT void xf86ReloadInputDevs(int sig) { InputInfoPtr pInfo; diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index e479557cc..385c3e197 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -48,7 +48,7 @@ /* Index into pScreen.devPrivates */ static int xf86CreateRootWindowKeyIndex; -DevPrivateKey xf86CreateRootWindowKey = &xf86CreateRootWindowKeyIndex; +_X_EXPORT DevPrivateKey xf86CreateRootWindowKey = &xf86CreateRootWindowKeyIndex; /* Index of ScrnInfo in pScreen.devPrivates */ static int xf86ScreenKeyIndex; _X_EXPORT DevPrivateKey xf86ScreenKey = &xf86ScreenKeyIndex; @@ -92,7 +92,7 @@ _X_EXPORT const unsigned char byte_reversed[256] = }; /* Globals that input drivers may access */ -InputInfoPtr xf86InputDevs = NULL; +_X_EXPORT InputInfoPtr xf86InputDevs = NULL; /* Globals that video drivers may not access */ @@ -139,29 +139,29 @@ _X_EXPORT xf86InfoRec xf86Info = { .autoEnableDevices = FALSE #endif }; -const char *xf86ConfigFile = NULL; -const char *xf86InputDeviceList = NULL; -const char *xf86ModulePath = DEFAULT_MODULE_PATH; -MessageType xf86ModPathFrom = X_DEFAULT; -const char *xf86LogFile = DEFAULT_LOGPREFIX; -MessageType xf86LogFileFrom = X_DEFAULT; -Bool xf86LogFileWasOpened = FALSE; -serverLayoutRec xf86ConfigLayout = {NULL, }; +_X_EXPORT const char *xf86ConfigFile = NULL; +_X_EXPORT const char *xf86InputDeviceList = NULL; +_X_EXPORT const char *xf86ModulePath = DEFAULT_MODULE_PATH; +_X_EXPORT MessageType xf86ModPathFrom = X_DEFAULT; +_X_EXPORT const char *xf86LogFile = DEFAULT_LOGPREFIX; +_X_EXPORT MessageType xf86LogFileFrom = X_DEFAULT; +_X_EXPORT Bool xf86LogFileWasOpened = FALSE; +_X_EXPORT serverLayoutRec xf86ConfigLayout = {NULL, }; _X_EXPORT confDRIRec xf86ConfigDRI = {0, }; XF86ConfigPtr xf86configptr = NULL; -Bool xf86Resetting = FALSE; -Bool xf86Initialising = FALSE; -Bool xf86DoProbe = FALSE; -Bool xf86DoConfigure = FALSE; -Bool xf86DoShowOptions = FALSE; -Bool xf86DoModalias = FALSE; -DriverPtr *xf86DriverList = NULL; -int xf86NumDrivers = 0; +_X_EXPORT Bool xf86Resetting = FALSE; +_X_EXPORT Bool xf86Initialising = FALSE; +_X_EXPORT Bool xf86DoProbe = FALSE; +_X_EXPORT Bool xf86DoConfigure = FALSE; +_X_EXPORT Bool xf86DoShowOptions = FALSE; +_X_EXPORT Bool xf86DoModalias = FALSE; +_X_EXPORT DriverPtr *xf86DriverList = NULL; +_X_EXPORT int xf86NumDrivers = 0; InputDriverPtr *xf86InputDriverList = NULL; int xf86NumInputDrivers = 0; -int xf86NumScreens = 0; +_X_EXPORT int xf86NumScreens = 0; -const char *xf86VisualNames[] = { +_X_EXPORT const char *xf86VisualNames[] = { "StaticGray", "GrayScale", "StaticColor", @@ -172,36 +172,36 @@ const char *xf86VisualNames[] = { /* Parameters set only from the command line */ char *xf86ServerName = "no-name"; -Bool xf86fpFlag = FALSE; -Bool xf86sFlag = FALSE; -Bool xf86bsEnableFlag = FALSE; -Bool xf86bsDisableFlag = FALSE; -Bool xf86silkenMouseDisableFlag = FALSE; +_X_EXPORT Bool xf86fpFlag = FALSE; +_X_EXPORT Bool xf86sFlag = FALSE; +_X_EXPORT Bool xf86bsEnableFlag = FALSE; +_X_EXPORT Bool xf86bsDisableFlag = FALSE; +_X_EXPORT Bool xf86silkenMouseDisableFlag = FALSE; #ifdef HAVE_ACPI -Bool xf86acpiDisableFlag = FALSE; +_X_EXPORT Bool xf86acpiDisableFlag = FALSE; #endif -char *xf86LayoutName = NULL; -char *xf86ScreenName = NULL; -char *xf86PointerName = NULL; -char *xf86KeyboardName = NULL; -Bool xf86ProbeOnly = FALSE; -int xf86Verbose = DEFAULT_VERBOSE; -int xf86LogVerbose = DEFAULT_LOG_VERBOSE; -int xf86FbBpp = -1; -Pix24Flags xf86Pix24 = Pix24DontCare; -int xf86Depth = -1; -rgb xf86Weight = {0, 0, 0}; -Bool xf86FlipPixels = FALSE; -Gamma xf86Gamma = {0.0, 0.0, 0.0}; -Bool xf86AllowMouseOpenFail = FALSE; +_X_EXPORT char *xf86LayoutName = NULL; +_X_EXPORT char *xf86ScreenName = NULL; +_X_EXPORT char *xf86PointerName = NULL; +_X_EXPORT char *xf86KeyboardName = NULL; +_X_EXPORT Bool xf86ProbeOnly = FALSE; +_X_EXPORT int xf86Verbose = DEFAULT_VERBOSE; +_X_EXPORT int xf86LogVerbose = DEFAULT_LOG_VERBOSE; +_X_EXPORT int xf86FbBpp = -1; +_X_EXPORT Pix24Flags xf86Pix24 = Pix24DontCare; +_X_EXPORT int xf86Depth = -1; +_X_EXPORT rgb xf86Weight = {0, 0, 0}; +_X_EXPORT Bool xf86FlipPixels = FALSE; +_X_EXPORT Gamma xf86Gamma = {0.0, 0.0, 0.0}; +_X_EXPORT Bool xf86AllowMouseOpenFail = FALSE; #ifdef XF86VIDMODE -Bool xf86VidModeDisabled = FALSE; -Bool xf86VidModeAllowNonLocal = FALSE; +_X_EXPORT Bool xf86VidModeDisabled = FALSE; +_X_EXPORT Bool xf86VidModeAllowNonLocal = FALSE; #endif -RootWinPropPtr *xf86RegisteredPropertiesTable = NULL; +_X_EXPORT RootWinPropPtr *xf86RegisteredPropertiesTable = NULL; _X_EXPORT Bool xf86inSuspend = FALSE; _X_EXPORT Bool xorgHWAccess = FALSE; -struct pci_slot_match xf86IsolateDevice = { +_X_EXPORT struct pci_slot_match xf86IsolateDevice = { PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, 0 }; diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index d626f671a..2c550feb5 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -133,7 +133,7 @@ xf86AddInputDriver(InputDriverPtr driver, pointer module, int flags) xf86InputDriverList[xf86NumInputDrivers - 1]->refCount = 0; } -void +_X_EXPORT void xf86DeleteInputDriver(int drvIndex) { if (xf86InputDriverList[drvIndex] && xf86InputDriverList[drvIndex]->module) @@ -142,7 +142,7 @@ xf86DeleteInputDriver(int drvIndex) xf86InputDriverList[drvIndex] = NULL; } -InputDriverPtr +_X_EXPORT InputDriverPtr xf86LookupInputDriver(const char *name) { int i; @@ -155,7 +155,7 @@ xf86LookupInputDriver(const char *name) return NULL; } -InputInfoPtr +_X_EXPORT InputInfoPtr xf86LookupInput(const char *name) { InputInfoPtr p; @@ -1334,7 +1334,7 @@ xf86ErrorF(const char *format, ...) } -void +_X_EXPORT void xf86LogInit() { char *lf = NULL; @@ -1365,7 +1365,7 @@ xf86LogInit() free(lf); } -void +_X_EXPORT void xf86CloseLog() { LogClose(); @@ -2143,7 +2143,7 @@ xf86ServerIsResetting() } -Bool +_X_EXPORT Bool xf86ServerIsInitialising() { return xf86Initialising; @@ -2583,7 +2583,7 @@ xf86ConfigPciEntityInactive(EntityInfoPtr pEnt, PciChipsets *p_chip, xf86SetEntityFuncs(pEnt->index,init,enter,leave,private); } -void +_X_EXPORT void xf86ConfigFbEntityInactive(EntityInfoPtr pEnt, EntityProc init, EntityProc enter, EntityProc leave, pointer private) { diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 922e7b35d..b2bf8db5e 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -613,7 +613,7 @@ check_for_matching_devices(DriverPtr drvp) * If a device can be successfully probed by the driver, \c TRUE is * returned. Otherwise, \c FALSE is returned. */ -Bool +_X_EXPORT Bool xf86CallDriverProbe( DriverPtr drv, Bool detect_only ) { Bool foundScreen = FALSE; @@ -719,7 +719,7 @@ DoProbe(void) * That includes vt-manager setup, querying all possible devices and * collecting the pixmap formats. */ -void +_X_EXPORT void InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) { int i, j, k, scr_index; @@ -1305,7 +1305,7 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) * Initialize all supported input devices. */ -void +_X_EXPORT void InitInput(argc, argv) int argc; char **argv; @@ -1334,7 +1334,7 @@ InitInput(argc, argv) * is called by dix before establishing the well known sockets. */ -void +_X_EXPORT void OsVendorInit() { static Bool beenHere = FALSE; @@ -1379,7 +1379,7 @@ OsVendorInit() * checking here, since there should be restored as much as possible. */ -void +_X_EXPORT void ddxGiveUp() { int i; @@ -1424,7 +1424,7 @@ ddxGiveUp() * are closed. */ -void +_X_EXPORT void AbortDDX() { int i; @@ -1460,7 +1460,7 @@ AbortDDX() ddxGiveUp(); } -void +_X_EXPORT void OsVendorFatalError() { #ifdef VENDORSUPPORT @@ -1476,7 +1476,7 @@ OsVendorFatalError() ErrorF("\n"); } -int +_X_EXPORT int xf86SetVerbosity(int verb) { int save = xf86Verbose; @@ -1486,7 +1486,7 @@ xf86SetVerbosity(int verb) return save; } -int +_X_EXPORT int xf86SetLogVerbosity(int verb) { int save = xf86LogVerbose; @@ -1517,7 +1517,7 @@ xf86PrintDefaultLibraryPath(void) */ /* ARGSUSED */ -int +_X_EXPORT int ddxProcessArgument(int argc, char **argv, int i) { /* @@ -1852,7 +1852,7 @@ ddxProcessArgument(int argc, char **argv, int i) * Maybe the user now knows what really to do ... */ -void +_X_EXPORT void ddxUseMsg() { ErrorF("\n"); @@ -1906,7 +1906,7 @@ ddxUseMsg() /* * xf86LoadModules iterates over a list that is being passed in. */ -Bool +_X_EXPORT Bool xf86LoadModules(char **list, pointer *optlist) { int errmaj, errmin; diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index 50a7d9cb9..f4d35fc0f 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -855,7 +855,7 @@ xf86NameCmp(const char *s1, const char *s2) return xf86nameCompare(s1, s2); } -char * +_X_EXPORT char * xf86NormalizeName(const char *s) { char *ret, *q; diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index 7c8320dee..87b9fa87b 100644 --- a/hw/xfree86/common/xf86PM.c +++ b/hw/xfree86/common/xf86PM.c @@ -34,8 +34,8 @@ #include "xf86Priv.h" #include "xf86Xinput.h" -int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num) = NULL; -pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event) = NULL; +_X_EXPORT int (*xf86PMGetEventFromOs)(int fd,pmEvent *events,int num) = NULL; +_X_EXPORT pmWait (*xf86PMConfirmEventToOs)(int fd,pmEvent event) = NULL; static Bool suspended = FALSE; @@ -178,7 +178,7 @@ DoApmEvent(pmEvent event, Bool undo) #define MAX_NO_EVENTS 8 -void +_X_EXPORT void xf86HandlePMEvents(int fd, pointer data) { pmEvent events[MAX_NO_EVENTS]; diff --git a/hw/xfree86/common/xf86RAC.c b/hw/xfree86/common/xf86RAC.c index 24d29e445..1ee5e5705 100644 --- a/hw/xfree86/common/xf86RAC.c +++ b/hw/xfree86/common/xf86RAC.c @@ -262,7 +262,7 @@ static int RACGCKeyIndex; static DevPrivateKey RACGCKey = &RACGCKeyIndex; -Bool +_X_EXPORT Bool xf86RACInit(ScreenPtr pScreen, unsigned int flag) { ScrnInfoPtr pScrn; diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index 847191475..79d301763 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -411,7 +411,7 @@ xf86RandRSetNewVirtualAndDimensions(ScreenPtr pScreen, return TRUE; } -Bool +_X_EXPORT Bool xf86RandRInit (ScreenPtr pScreen) { rrScrPrivPtr rp; diff --git a/hw/xfree86/common/xf86ShowOpts.c b/hw/xfree86/common/xf86ShowOpts.c index b8efa73c2..077d93604 100644 --- a/hw/xfree86/common/xf86ShowOpts.c +++ b/hw/xfree86/common/xf86ShowOpts.c @@ -76,7 +76,7 @@ optionTypeToSting(OptionValueType type) } } -void DoShowOptions (void) { +_X_EXPORT void DoShowOptions (void) { int i = 0; char **vlist = 0; char *pSymbol = 0; diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 2cb41e599..376af770c 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -96,7 +96,7 @@ #include "os.h" -EventListPtr xf86Events = NULL; +_X_EXPORT EventListPtr xf86Events = NULL; /** * Eval config and modify DeviceVelocityRec accordingly @@ -360,7 +360,7 @@ xf86ActivateDevice(LocalDevicePtr local) *********************************************************************** */ -void +_X_EXPORT void OpenInputDevice(DeviceIntPtr dev, ClientPtr client, int *status) @@ -371,7 +371,7 @@ OpenInputDevice(DeviceIntPtr dev, *status = Success; } -void +_X_EXPORT void CloseInputDevice(DeviceIntPtr dev, ClientPtr client) { @@ -390,7 +390,7 @@ CloseInputDevice(DeviceIntPtr dev, *********************************************************************** */ -int +_X_EXPORT int SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode) { LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate; @@ -416,7 +416,7 @@ SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode) *********************************************************************** */ -int +_X_EXPORT int SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators, int first_valuator, int num_valuators) { @@ -439,7 +439,7 @@ SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators, *********************************************************************** */ -int +_X_EXPORT int ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control) { LocalDevicePtr local = (LocalDevicePtr)dev->public.devicePrivate; @@ -462,7 +462,7 @@ ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control) } } -void +_X_EXPORT void AddOtherInputDevices() { } diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index e57844764..3944d7873 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -1098,7 +1098,7 @@ xf86GetGammaRamp( return Success; } -int +_X_EXPORT int xf86ChangeGamma( ScreenPtr pScreen, Gamma gamma diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index 102f6b1b2..bd7d935e5 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -51,7 +51,7 @@ #include "xf86RAC.h" -Bool fbSlotClaimed = FALSE; +_X_EXPORT Bool fbSlotClaimed = FALSE; _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) @@ -79,7 +79,7 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active) /* * Get the list of FB "slots" claimed by a screen */ -int +_X_EXPORT int xf86GetFbInfoForScreen(int scrnIndex) { int num = 0; diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index b6ec4adbb..df8d8a58f 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -53,7 +53,7 @@ #include "xf86RAC.h" /* Bus-specific globals */ -Bool pciSlotClaimed = FALSE; +_X_EXPORT Bool pciSlotClaimed = FALSE; static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw */ diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index af2b14539..78e5d7cb7 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -41,7 +41,7 @@ #include "xf86sbusBus.h" #include "xf86Sbus.h" -Bool sbusSlotClaimed = FALSE; +_X_EXPORT Bool sbusSlotClaimed = FALSE; static int xf86nSbusInfo; @@ -79,7 +79,7 @@ CheckSbusDevice(const char *device, int fbNum) psdp->fd = -1; } -void +_X_EXPORT void xf86SbusProbe(void) { int i, useProm = 0; diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index 4791f1b1e..cc8452528 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -113,7 +113,7 @@ static Bool xf86XVInitAdaptors(ScreenPtr, XF86VideoAdaptorPtr*, int); static int XF86XVWindowKeyIndex; static DevPrivateKey XF86XVWindowKey = &XF86XVWindowKeyIndex; static int XF86XvScreenKeyIndex; -DevPrivateKey XF86XvScreenKey = &XF86XvScreenKeyIndex; +_X_EXPORT DevPrivateKey XF86XvScreenKey = &XF86XvScreenKeyIndex; static unsigned long PortResource = 0; _X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void) = NULL; diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c index 7f9dd507a..00fe7cab3 100644 --- a/hw/xfree86/common/xorgHelper.c +++ b/hw/xfree86/common/xorgHelper.c @@ -16,7 +16,7 @@ #include "xorgVersion.h" -CARD32 +_X_EXPORT CARD32 xorgGetVersion() { return XORG_VERSION_CURRENT; diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index 1e57731a7..588e2547b 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -163,7 +163,7 @@ xf86InterpretEDID(int scrnIndex, Uchar *block) return NULL; } -xf86MonPtr +_X_EXPORT xf86MonPtr xf86InterpretEEDID(int scrnIndex, Uchar *block) { xf86MonPtr m; diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index df0030e80..e712b4288 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -62,9 +62,9 @@ static void DGAClientStateChange (CallbackListPtr*, pointer, pointer); static ClientPtr DGAClients[MAXSCREENS]; -unsigned char DGAReqCode = 0; -int DGAErrorBase; -int DGAEventBase; +_X_EXPORT unsigned char DGAReqCode = 0; +_X_EXPORT int DGAErrorBase; +_X_EXPORT int DGAEventBase; static int DGAClientPrivateKeyIndex; static DevPrivateKey DGAClientPrivateKey = &DGAClientPrivateKeyIndex; diff --git a/hw/xfree86/dixmods/xkbKillSrv.c b/hw/xfree86/dixmods/xkbKillSrv.c index 9074fd390..ac9c41220 100644 --- a/hw/xfree86/dixmods/xkbKillSrv.c +++ b/hw/xfree86/dixmods/xkbKillSrv.c @@ -45,7 +45,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xf86.h" -int +_X_EXPORT int XkbDDXTerminateServer(DeviceIntPtr dev,KeyCode key,XkbAction *act) { if (dev != inputInfo.keyboard) diff --git a/hw/xfree86/dixmods/xkbPrivate.c b/hw/xfree86/dixmods/xkbPrivate.c index db21a4e17..e2a1273d7 100644 --- a/hw/xfree86/dixmods/xkbPrivate.c +++ b/hw/xfree86/dixmods/xkbPrivate.c @@ -17,7 +17,7 @@ #include "os.h" #include "xf86.h" -int +_X_EXPORT int XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act) { XkbAnyAction *xf86act = &(act->any); diff --git a/hw/xfree86/dixmods/xkbVT.c b/hw/xfree86/dixmods/xkbVT.c index e6d69e2eb..aaa4665a5 100644 --- a/hw/xfree86/dixmods/xkbVT.c +++ b/hw/xfree86/dixmods/xkbVT.c @@ -45,7 +45,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xf86.h" -int +_X_EXPORT int XkbDDXSwitchScreen(DeviceIntPtr dev,KeyCode key,XkbAction *act) { int scrnnum = XkbSAScreen(&act->screen); diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 35b1fcf7d..370c6a289 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -132,26 +132,26 @@ DRIOpenDRMCleanup(DRIEntPrivPtr pDRIEntPriv) } } -int +_X_EXPORT int DRIMasterFD(ScrnInfoPtr pScrn) { return DRI_ENT_PRIV(pScrn)->drmFD; } -void * +_X_EXPORT void * DRIMasterSareaPointer(ScrnInfoPtr pScrn) { return DRI_ENT_PRIV(pScrn)->pLSAREA; } -drm_handle_t +_X_EXPORT drm_handle_t DRIMasterSareaHandle(ScrnInfoPtr pScrn) { return DRI_ENT_PRIV(pScrn)->hLSAREA; } -Bool +_X_EXPORT Bool DRIOpenDRMMaster(ScrnInfoPtr pScrn, unsigned long sAreaSize, const char *busID, @@ -785,7 +785,7 @@ drmServerInfo DRIDRMServerInfo = { dri_drm_get_perms, }; -Bool +_X_EXPORT Bool DRIExtensionInit(void) { if (!DRIScreenPrivKey || DRIGeneration != serverGeneration) { @@ -800,7 +800,7 @@ DRIExtensionInit(void) return TRUE; } -void +_X_EXPORT void DRIReset(void) { /* @@ -880,7 +880,7 @@ DRIGetClientDriverName(ScreenPtr pScreen, DRICreateContextPriv returns a pointer to newly allocated DRIContextPriv, and returns the kernel drm_context_t in pHWContext. */ -DRIContextPrivPtr +_X_EXPORT DRIContextPrivPtr DRICreateContextPriv(ScreenPtr pScreen, drm_context_t * pHWContext, DRIContextFlags flags) @@ -894,7 +894,7 @@ DRICreateContextPriv(ScreenPtr pScreen, return DRICreateContextPrivFromHandle(pScreen, *pHWContext, flags); } -DRIContextPrivPtr +_X_EXPORT DRIContextPrivPtr DRICreateContextPrivFromHandle(ScreenPtr pScreen, drm_context_t hHWContext, DRIContextFlags flags) @@ -940,7 +940,7 @@ DRICreateContextPrivFromHandle(ScreenPtr pScreen, return pDRIContextPriv; } -Bool +_X_EXPORT Bool DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv) { DRIScreenPrivPtr pDRIPriv; @@ -1059,7 +1059,7 @@ DRIDestroyContext(ScreenPtr pScreen, XID context) } /* DRIContextPrivDelete is called by the resource manager. */ -Bool +_X_EXPORT Bool DRIContextPrivDelete(pointer pResource, XID id) { DRIContextPrivPtr pDRIContextPriv = (DRIContextPrivPtr)pResource; @@ -1361,7 +1361,7 @@ DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable) return TRUE; } -Bool +_X_EXPORT Bool DRIDrawablePrivDelete(pointer pResource, XID id) { WindowPtr pWin; @@ -1645,7 +1645,7 @@ DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask) } } -void +_X_EXPORT void DRIDoWakeupHandler(int screenNum, pointer wakeupData, unsigned long result, pointer pReadmask) { @@ -1664,7 +1664,7 @@ DRIDoWakeupHandler(int screenNum, pointer wakeupData, } } -void +_X_EXPORT void DRIDoBlockHandler(int screenNum, pointer blockData, pointer pTimeout, pointer pReadmask) { @@ -1688,7 +1688,7 @@ DRIDoBlockHandler(int screenNum, pointer blockData, DRIUnlock(pScreen); } -void +_X_EXPORT void DRISwapContext(int drmFD, void *oldctx, void *newctx) { DRIContextPrivPtr oldContext = (DRIContextPrivPtr)oldctx; @@ -1835,13 +1835,13 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx) newContextStore); } -void* +_X_EXPORT void* DRIGetContextStore(DRIContextPrivPtr context) { return((void *)context->pContextStore); } -void +_X_EXPORT void DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -1891,7 +1891,7 @@ DRITreeTraversal(WindowPtr pWin, pointer data) return WT_WALKCHILDREN; } -Bool +_X_EXPORT Bool DRIDestroyWindow(WindowPtr pWin) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -1916,7 +1916,7 @@ DRIDestroyWindow(WindowPtr pWin) return retval; } -void +_X_EXPORT void DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -2055,7 +2055,7 @@ DRILockTree(ScreenPtr pScreen) } } -int +_X_EXPORT int DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) { ScreenPtr pScreen = pParent->drawable.pScreen; @@ -2081,7 +2081,7 @@ DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) return returnValue; } -void +_X_EXPORT void DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) { ScreenPtr pScreen; @@ -2107,7 +2107,7 @@ DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind) } } -void +_X_EXPORT void DRIClipNotify(WindowPtr pWin, int dx, int dy) { ScreenPtr pScreen = pWin->drawable.pScreen; @@ -2174,7 +2174,7 @@ DRIGetDrawableIndex(WindowPtr pWin) return index; } -unsigned int +_X_EXPORT unsigned int DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -2182,7 +2182,7 @@ DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index) } -void +_X_EXPORT void DRIPrintDrawableLock(ScreenPtr pScreen, char *msg) { DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen); @@ -2271,7 +2271,7 @@ DRIGetTexOffsetFuncs(ScreenPtr pScreen, * call the lowerlevel functions, and choose whether they will be * called at every level of recursion (eg in validatetree). */ -DRIWrappedFuncsRec * +_X_EXPORT DRIWrappedFuncsRec * DRIGetWrappedFuncs(ScreenPtr pScreen) { return &(DRI_SCREEN_PRIV(pScreen)->wrap); @@ -2297,7 +2297,7 @@ _DRIAdjustFrame(ScrnInfoPtr pScrn, DRIScreenPrivPtr pDRIPriv, int x, int y) pDRIPriv->pSAREA->frame.height = pScrn->frameY1 - y + 1; } -void +_X_EXPORT void DRIAdjustFrame(int scrnIndex, int x, int y, int flags) { ScreenPtr pScreen = screenInfo.screens[scrnIndex]; @@ -2479,7 +2479,7 @@ static void drmSIGIOHandler(int interrupt, void *closure) } -int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)) +_X_EXPORT int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)) { drmHashEntry *entry; @@ -2489,7 +2489,7 @@ int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *)) return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0); } -int drmRemoveSIGIOHandler(int fd) +_X_EXPORT int drmRemoveSIGIOHandler(int fd) { drmHashEntry *entry = drmGetEntry(fd); diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c index 5db2629fd..64132a718 100644 --- a/hw/xfree86/dri2/dri2.c +++ b/hw/xfree86/dri2/dri2.c @@ -240,7 +240,7 @@ DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd, return TRUE; } -Bool +_X_EXPORT Bool DRI2Authenticate(ScreenPtr pScreen, drm_magic_t magic) { DRI2ScreenPtr ds = DRI2GetScreen(pScreen); @@ -268,7 +268,7 @@ DRI2ClipNotify(WindowPtr pWin, int dx, int dy) } } -Bool +_X_EXPORT Bool DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) { DRI2ScreenPtr ds; @@ -295,7 +295,7 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) return TRUE; } -void +_X_EXPORT void DRI2CloseScreen(ScreenPtr pScreen) { DRI2ScreenPtr ds = DRI2GetScreen(pScreen); diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index b671d4dde..52183eaee 100644 --- a/hw/xfree86/dummylib/xalloc.c +++ b/hw/xfree86/dummylib/xalloc.c @@ -94,7 +94,7 @@ Xstrdup(const char *s) return sd; } -char * +_X_EXPORT char * XNFstrdup(const char *s) { char *sd; diff --git a/hw/xfree86/dummylib/xf86servisinit.c b/hw/xfree86/dummylib/xf86servisinit.c index c356a2b88..077cab2fc 100644 --- a/hw/xfree86/dummylib/xf86servisinit.c +++ b/hw/xfree86/dummylib/xf86servisinit.c @@ -11,7 +11,7 @@ * Utility functions required by libxf86_os. */ -Bool +_X_EXPORT Bool xf86ServerIsInitialising() { return FALSE; diff --git a/hw/xfree86/dummylib/xf86verbose.c b/hw/xfree86/dummylib/xf86verbose.c index c4a45d68e..324d891c7 100644 --- a/hw/xfree86/dummylib/xf86verbose.c +++ b/hw/xfree86/dummylib/xf86verbose.c @@ -8,5 +8,5 @@ #include "xf86Priv.h" /* Dummy variables */ -int xf86Verbose = 0; +_X_EXPORT int xf86Verbose = 0; diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c index 119bed342..ecb63b858 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.c +++ b/hw/xfree86/fbdevhw/fbdevhw.c @@ -126,7 +126,7 @@ typedef struct { } fbdevHWRec, *fbdevHWPtr; -Bool +_X_EXPORT Bool fbdevHWGetRec(ScrnInfoPtr pScrn) { fbdevHWPtr fPtr; @@ -840,7 +840,7 @@ fbdevHWRestore(ScrnInfoPtr pScrn) /* -------------------------------------------------------------------- */ /* callback for xf86HandleColormaps */ -void +_X_EXPORT void fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual) { @@ -872,7 +872,7 @@ fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, /* -------------------------------------------------------------------- */ /* these can be hooked directly into ScrnInfoRec */ -ModeStatus +_X_EXPORT ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c index 58f93b7e6..1c3f2f660 100644 --- a/hw/xfree86/fbdevhw/fbdevhwstub.c +++ b/hw/xfree86/fbdevhw/fbdevhwstub.c @@ -9,7 +9,7 @@ /* Stubs for the static server on platforms that don't support fbdev */ -Bool +_X_EXPORT Bool fbdevHWGetRec(ScrnInfoPtr pScrn) { return FALSE; @@ -126,13 +126,13 @@ fbdevHWRestore(ScrnInfoPtr pScrn) { } -void +_X_EXPORT void fbdevHWLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, VisualPtr pVisual) { } -ModeStatus +_X_EXPORT ModeStatus fbdevHWValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { return MODE_ERROR; diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index 0993699ad..c659b1755 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -451,7 +451,7 @@ xf86I2CWriteRead(I2CDevPtr d, /* Read a byte, the only readable register of a device. */ -Bool +_X_EXPORT Bool xf86I2CReadStatus(I2CDevPtr d, I2CByte *pbyte) { return xf86I2CWriteRead(d, NULL, 0, pbyte, 1); @@ -480,7 +480,7 @@ xf86I2CReadBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *pbyte, int n) * determined by its sub-address. */ -Bool +_X_EXPORT Bool xf86I2CReadWord(I2CDevPtr d, I2CByte subaddr, unsigned short *pword) { I2CByte rb[2]; @@ -510,7 +510,7 @@ xf86I2CWriteByte(I2CDevPtr d, I2CByte subaddr, I2CByte byte) * sub-address of the first register. */ -Bool +_X_EXPORT Bool xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr, I2CByte *WriteBuffer, int nWrite) { @@ -536,7 +536,7 @@ xf86I2CWriteBytes(I2CDevPtr d, I2CByte subaddr, * determined by its sub-address. */ -Bool +_X_EXPORT Bool xf86I2CWriteWord(I2CDevPtr d, I2CByte subaddr, unsigned short word) { I2CByte wb[3]; diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index a9006e216..2cda75394 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -321,7 +321,7 @@ UnmapVRam(xf86Int10InfoPtr pInt) xf86UnMapVidMem(screen, INTPriv(pInt)->vRam, size); } -Bool +_X_EXPORT Bool MapCurrentInt10(xf86Int10InfoPtr pInt) { /* nothing to do here */ diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index e01e80b1f..ab559eda9 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -49,7 +49,7 @@ static void SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set); #define REG pInt -int +_X_EXPORT int setup_int(xf86Int10InfoPtr pInt) { if (pInt != Int10Current) { @@ -78,7 +78,7 @@ setup_int(xf86Int10InfoPtr pInt) return xf86BlockSIGIO(); } -void +_X_EXPORT void finish_int(xf86Int10InfoPtr pInt, int sig) { xf86UnblockSIGIO(sig); @@ -98,20 +98,20 @@ finish_int(xf86Int10InfoPtr pInt, int sig) } /* general software interrupt handler */ -CARD32 +_X_EXPORT CARD32 getIntVect(xf86Int10InfoPtr pInt,int num) { return MEM_RW(pInt, num << 2) + (MEM_RW(pInt, (num << 2) + 2) << 4); } -void +_X_EXPORT void pushw(xf86Int10InfoPtr pInt, CARD16 val) { X86_ESP -= 2; MEM_WW(pInt, ((CARD32) X86_SS << 4) + X86_SP, val); } -int +_X_EXPORT int run_bios_int(int num, xf86Int10InfoPtr pInt) { CARD32 eflags; @@ -157,7 +157,7 @@ run_bios_int(int num, xf86Int10InfoPtr pInt) } /* Debugging stuff */ -void +_X_EXPORT void dump_code(xf86Int10InfoPtr pInt) { int i; @@ -172,7 +172,7 @@ dump_code(xf86Int10InfoPtr pInt) xf86ErrorFVerb(3, "\n"); } -void +_X_EXPORT void dump_registers(xf86Int10InfoPtr pInt) { xf86DrvMsgVerb(pInt->scrnIndex, X_INFO, 3, @@ -192,7 +192,7 @@ dump_registers(xf86Int10InfoPtr pInt) (unsigned long)X86_EIP, (unsigned long)X86_EFLAGS); } -void +_X_EXPORT void stack_trace(xf86Int10InfoPtr pInt) { int i = 0; @@ -212,7 +212,7 @@ stack_trace(xf86Int10InfoPtr pInt) xf86ErrorFVerb(3, "\n"); } -int +_X_EXPORT int port_rep_inb(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -228,7 +228,7 @@ port_rep_inb(xf86Int10InfoPtr pInt, return dst - base; } -int +_X_EXPORT int port_rep_inw(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -244,7 +244,7 @@ port_rep_inw(xf86Int10InfoPtr pInt, return dst - base; } -int +_X_EXPORT int port_rep_inl(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -260,7 +260,7 @@ port_rep_inl(xf86Int10InfoPtr pInt, return dst - base; } -int +_X_EXPORT int port_rep_outb(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -276,7 +276,7 @@ port_rep_outb(xf86Int10InfoPtr pInt, return dst - base; } -int +_X_EXPORT int port_rep_outw(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -292,7 +292,7 @@ port_rep_outw(xf86Int10InfoPtr pInt, return dst - base; } -int +_X_EXPORT int port_rep_outl(xf86Int10InfoPtr pInt, CARD16 port, CARD32 base, int d_f, CARD32 count) { @@ -308,7 +308,7 @@ port_rep_outl(xf86Int10InfoPtr pInt, return dst - base; } -CARD8 +_X_EXPORT CARD8 x_inb(CARD16 port) { CARD8 val; @@ -337,7 +337,7 @@ x_inb(CARD16 port) return val; } -CARD16 +_X_EXPORT CARD16 x_inw(CARD16 port) { CARD16 val; @@ -359,7 +359,7 @@ x_inw(CARD16 port) return val; } -void +_X_EXPORT void x_outb(CARD16 port, CARD8 val) { if ((port == 0x43) && (val == 0)) { @@ -390,7 +390,7 @@ x_outb(CARD16 port, CARD8 val) } } -void +_X_EXPORT void x_outw(CARD16 port, CARD16 val) { @@ -401,7 +401,7 @@ x_outw(CARD16 port, CARD16 val) } } -CARD32 +_X_EXPORT CARD32 x_inl(CARD16 port) { CARD32 val; @@ -414,7 +414,7 @@ x_inl(CARD16 port) return val; } -void +_X_EXPORT void x_outl(CARD16 port, CARD32 val) { if (!pciCfg1out(port, val)) { @@ -424,37 +424,37 @@ x_outl(CARD16 port, CARD32 val) } } -CARD8 +_X_EXPORT CARD8 Mem_rb(CARD32 addr) { return (*Int10Current->mem->rb)(Int10Current, addr); } -CARD16 +_X_EXPORT CARD16 Mem_rw(CARD32 addr) { return (*Int10Current->mem->rw)(Int10Current, addr); } -CARD32 +_X_EXPORT CARD32 Mem_rl(CARD32 addr) { return (*Int10Current->mem->rl)(Int10Current, addr); } -void +_X_EXPORT void Mem_wb(CARD32 addr, CARD8 val) { (*Int10Current->mem->wb)(Int10Current, addr, val); } -void +_X_EXPORT void Mem_ww(CARD32 addr, CARD16 val) { (*Int10Current->mem->ww)(Int10Current, addr, val); } -void +_X_EXPORT void Mem_wl(CARD32 addr, CARD32 val) { (*Int10Current->mem->wl)(Int10Current, addr, val); @@ -613,7 +613,7 @@ pciCfg1outb(CARD16 addr, CARD8 val) return 0; } -CARD8 +_X_EXPORT CARD8 bios_checksum(const CARD8 *start, int size) { CARD8 sum = 0; @@ -641,7 +641,7 @@ bios_checksum(const CARD8 *start, int size) * the driver would have to load the vga-module prior to * doing int10. */ -void +_X_EXPORT void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga) { xf86SetCurrentAccess(FALSE, xf86Screens[pInt->scrnIndex]); @@ -660,7 +660,7 @@ LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga) xf86SetCurrentAccess(TRUE, xf86Screens[pInt->scrnIndex]); } -void +_X_EXPORT void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga) { xf86SetCurrentAccess(FALSE, xf86Screens[pInt->scrnIndex]); @@ -693,7 +693,7 @@ SetResetBIOSVars(xf86Int10InfoPtr pInt, Bool set) xf86UnMapVidMem(pInt->scrnIndex,base,pagesize); } -void +_X_EXPORT void xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save) { int pagesize = getpagesize(); diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index 6f6ecc2b3..16d7c175c 100644 --- a/hw/xfree86/int10/helper_mem.c +++ b/hw/xfree86/int10/helper_mem.c @@ -34,7 +34,7 @@ static const OptionInfoRec INT10Options[] = { }; #ifdef DEBUG -void +_X_EXPORT void dprint(unsigned long start, unsigned long size) { int i,j; @@ -62,7 +62,7 @@ dprint(unsigned long start, unsigned long size) * BIOS. Most of this information was pulled from * dosemu. */ -void +_X_EXPORT void setup_int_vect(xf86Int10InfoPtr pInt) { int i; @@ -105,7 +105,7 @@ setup_int_vect(xf86Int10InfoPtr pInt) } #endif -int +_X_EXPORT int setup_system_bios(void *base_addr) { char *base = (char *) base_addr; @@ -127,7 +127,7 @@ setup_system_bios(void *base_addr) return 1; } -void +_X_EXPORT void reset_int_vect(xf86Int10InfoPtr pInt) { /* @@ -176,7 +176,7 @@ reset_int_vect(xf86Int10InfoPtr pInt) MEM_WW(pInt, (0x6D << 2) + 2, SYS_BIOS >> 4); } -void +_X_EXPORT void set_return_trap(xf86Int10InfoPtr pInt) { /* @@ -191,7 +191,7 @@ set_return_trap(xf86Int10InfoPtr pInt) xf86Int10AllocPages(pInt, 1, &pInt->stackseg); } -void * +_X_EXPORT void * xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex) { EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex); @@ -220,7 +220,7 @@ xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex) return options; } -Bool +_X_EXPORT Bool int10skip(const void* options) { Bool noint10 = FALSE; @@ -231,7 +231,7 @@ int10skip(const void* options) return noint10; } -Bool +_X_EXPORT Bool int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem) { int size; @@ -258,7 +258,7 @@ int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem) return TRUE; } -Bool +_X_EXPORT Bool initPrimary(const void* options) { Bool initPrimary = FALSE; @@ -269,7 +269,7 @@ initPrimary(const void* options) return initPrimary; } -BusType +_X_EXPORT BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt) { BusType location_type; @@ -290,7 +290,7 @@ xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt) return FALSE; \ } -Bool +_X_EXPORT Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, void *base) { unsigned i; diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c index 80b619bef..4d9fe520a 100644 --- a/hw/xfree86/int10/stub.c +++ b/hw/xfree86/int10/stub.c @@ -25,7 +25,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) return NULL; } -Bool +_X_EXPORT Bool MapCurrentInt10(xf86Int10InfoPtr pInt) { return FALSE; @@ -50,7 +50,7 @@ xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num) return; } -Bool +_X_EXPORT Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt) { return FALSE; diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index 51eb91fbb..a7904dc6a 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -17,7 +17,7 @@ #define REG pInt -xf86Int10InfoPtr Int10Current = NULL; +_X_EXPORT xf86Int10InfoPtr Int10Current = NULL; static int int1A_handler(xf86Int10InfoPtr pInt); #ifndef _PC @@ -27,7 +27,7 @@ static int intE6_handler(xf86Int10InfoPtr pInt); static struct pci_device *findPci(xf86Int10InfoPtr pInt, unsigned short bx); static CARD32 pciSlotBX( const struct pci_device * pvp ); -int +_X_EXPORT int int_handler(xf86Int10InfoPtr pInt) { int num = pInt->num; diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index 7f5b9d41c..a884bf971 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -43,7 +43,7 @@ xf86ExecX86int10(xf86Int10InfoPtr pInt) finish_int(pInt, sig); } -Bool +_X_EXPORT Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt) { int i; diff --git a/hw/xfree86/loader/loadext.c b/hw/xfree86/loader/loadext.c index b7523289c..d8e615f35 100644 --- a/hw/xfree86/loader/loadext.c +++ b/hw/xfree86/loader/loadext.c @@ -40,7 +40,7 @@ * This should be static, but miinitext wants it. FIXME: make extension * initialization not completely terrible. */ -ExtensionModule *ExtensionModuleList = NULL; +_X_EXPORT ExtensionModule *ExtensionModuleList = NULL; static int numExtensionModules = 0; static ExtensionModule * diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index e98f013c4..2324e78a9 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -1080,7 +1080,7 @@ LoadModule(const char *module, const char *path, const char **subdirlist, modreq, errmaj, errmin, LD_FLAG_GLOBAL); } -void +_X_EXPORT void UnloadModule(ModuleDescPtr mod) { UnloadModuleOrDriver(mod); diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c index 1522fa731..959e37665 100644 --- a/hw/xfree86/modes/xf86Modes.c +++ b/hw/xfree86/modes/xf86Modes.c @@ -518,7 +518,7 @@ xf86ValidateModesBandwidth(ScrnInfoPtr pScrn, DisplayModePtr modeList, } } -Bool +_X_EXPORT Bool xf86ModeIsReduced(const DisplayModeRec *mode) { if ((((mode->HDisplay * 5 / 4) & ~0x07) > mode->HTotal) && diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index 476a0e957..81eec52e3 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -41,7 +41,7 @@ * This function is the signal handler for the VT-switching signal. It * is only referenced inside the OS-support layer. */ -void +_X_EXPORT void xf86VTRequest(int sig) { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) @@ -52,7 +52,7 @@ xf86VTRequest(int sig) return; } -Bool +_X_EXPORT Bool xf86VTSwitchPending() { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) @@ -63,7 +63,7 @@ xf86VTSwitchPending() return FALSE; } -Bool +_X_EXPORT Bool xf86VTSwitchAway() { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) @@ -78,7 +78,7 @@ xf86VTSwitchAway() return FALSE; } -Bool +_X_EXPORT Bool xf86VTSwitchTo() { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) diff --git a/hw/xfree86/os-support/bsd/bsd_apm.c b/hw/xfree86/os-support/bsd/bsd_apm.c index 43eda7421..feaed21a2 100644 --- a/hw/xfree86/os-support/bsd/bsd_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_apm.c @@ -108,7 +108,7 @@ bsdPMConfirmEventToOs(int fd, pmEvent event) } } -PMClose +_X_EXPORT PMClose xf86OSPMOpen(void) { int fd; diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index cbb9e4810..842523991 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -152,7 +152,7 @@ static xf86ConsOpen_t xf86ConsTab[] = { }; -void +_X_EXPORT void xf86OpenConsole() { int i, fd = -1; @@ -644,7 +644,7 @@ xf86OpenWScons() #endif /* WSCONS_SUPPORT */ -void +_X_EXPORT void xf86CloseConsole() { #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) @@ -704,7 +704,7 @@ xf86CloseConsole() return; } -int +_X_EXPORT int xf86ProcessArgument(int argc, char *argv[], int i) { /* @@ -732,7 +732,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) return(0); } -void +_X_EXPORT void xf86UseMsg() { #if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index b37070c37..db7dfbcd5 100644 --- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -153,7 +153,7 @@ bsdPMConfirmEventToOs(int dummyfd, pmEvent event) } } -PMClose +_X_EXPORT PMClose xf86OSPMOpen(void) { int kq; diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 83dabc9c6..4fc6dd714 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -448,7 +448,7 @@ xf86DisableIO() /***************************************************************************/ /* Set TV output mode */ /***************************************************************************/ -void +_X_EXPORT void xf86SetTVOut(int mode) { switch (xf86Info.consType) @@ -473,7 +473,7 @@ xf86SetTVOut(int mode) return; } -void +_X_EXPORT void xf86SetRGBOut() { switch (xf86Info.consType) diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index f1ff64c2a..86b7fb3fa 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -123,7 +123,7 @@ xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf, return rv; } -Bool xf86EnableIO() +_X_EXPORT Bool xf86EnableIO() { int fd = xf86Info.screenFd; @@ -141,7 +141,7 @@ Bool xf86EnableIO() return TRUE; } -void xf86DisableIO() +_X_EXPORT void xf86DisableIO() { if (ioBase != MAP_FAILED) diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index 8ca2f1f9b..888a9e36d 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -161,7 +161,7 @@ pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS addr) return(addr); } -Bool +_X_EXPORT Bool xf86scanpci(void) { Bool success = FALSE; diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index 1363d5746..2fe34bcaa 100644 --- a/hw/xfree86/os-support/bus/Sbus.c +++ b/hw/xfree86/os-support/bus/Sbus.c @@ -41,7 +41,7 @@ #include "xf86sbusBus.h" #include "xf86Sbus.h" -int promRootNode; +_X_EXPORT int promRootNode; static int promFd = -1; static int promCurrentNode; @@ -51,7 +51,7 @@ static int promP1275 = -1; #define MAX_VAL (4096-128-4) static struct openpromio *promOpio; -sbusDevicePtr *xf86SbusInfo = NULL; +_X_EXPORT sbusDevicePtr *xf86SbusInfo = NULL; struct sbus_devtable sbusDeviceTable[] = { { SBUS_DEVICE_BW2, FBTYPE_SUN2BW, "bwtwo", "sunbw2", "Sun Monochrome (bwtwo)" }, @@ -71,7 +71,7 @@ struct sbus_devtable sbusDeviceTable[] = { { 0, 0, NULL } }; -int +_X_EXPORT int promGetSibling(int node) { promOpio->oprom_size = sizeof(int); @@ -84,7 +84,7 @@ promGetSibling(int node) return *(int *)promOpio->oprom_array; } -int +_X_EXPORT int promGetChild(int node) { promOpio->oprom_size = sizeof(int); @@ -97,7 +97,7 @@ promGetChild(int node) return *(int *)promOpio->oprom_array; } -char * +_X_EXPORT char * promGetProperty(const char *prop, int *lenp) { promOpio->oprom_size = MAX_VAL; @@ -109,7 +109,7 @@ promGetProperty(const char *prop, int *lenp) return promOpio->oprom_array; } -int +_X_EXPORT int promGetBool(const char *prop) { promOpio->oprom_size = 0; @@ -281,7 +281,7 @@ promWalkGetDriverName(int node, int oldnode) return NULL; } -char * +_X_EXPORT char * sparcDriverName(void) { char *name; @@ -367,7 +367,7 @@ promWalkAssignNodes(int node, int oldnode, int flags, sbusDevicePtr *devicePtrs) promWalkAssignNodes(nextnode, node, PROM_NODE_SIBLING | sbus, devicePtrs); } -void +_X_EXPORT void sparcPromAssignNodes(void) { sbusDevicePtr psdp, *psdpp; @@ -509,7 +509,7 @@ promWalkNode2Pathname(char *path, int parent, int node, int searchNode, int type return 0; } -char * +_X_EXPORT char * sparcPromNode2Pathname(sbusPromNodePtr pnode) { char *ret; @@ -578,7 +578,7 @@ promWalkPathname2Node(char *name, char *regstr, int parent, int type) } } -int +_X_EXPORT int sparcPromPathname2Node(const char *pathName) { int i; diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 263fd8ff1..fdd10d1d5 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -531,7 +531,7 @@ xf86MapLegacyIO(struct pci_device *dev) return (IOADDRESS)DomainMmappedIO[domain]; } -resPtr +_X_EXPORT resPtr xf86AccResFromOS(resPtr pRes) { struct pci_device *dev; diff --git a/hw/xfree86/os-support/hurd/hurd_init.c b/hw/xfree86/os-support/hurd/hurd_init.c index 8cd8f54d6..9f5e78403 100644 --- a/hw/xfree86/os-support/hurd/hurd_init.c +++ b/hw/xfree86/os-support/hurd/hurd_init.c @@ -43,19 +43,19 @@ #include <assert.h> #include <mach.h> -int +_X_EXPORT int xf86ProcessArgument( int argc,char **argv, int i ) { return 0; } -void +_X_EXPORT void xf86UseMsg() { return; } -void +_X_EXPORT void xf86OpenConsole() { if( serverGeneration == 1 ) @@ -81,7 +81,7 @@ xf86OpenConsole() return; } -void +_X_EXPORT void xf86CloseConsole() { close( xf86Info.consoleFd ); diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c index b814072cb..b0953775d 100644 --- a/hw/xfree86/os-support/hurd/hurd_video.c +++ b/hw/xfree86/os-support/hurd/hurd_video.c @@ -41,7 +41,7 @@ /************************************************************************** * Video Memory Mapping section ***************************************************************************/ -pointer +_X_EXPORT pointer xf86MapVidMem(int ScreenNum,int Flags, unsigned long Base, unsigned long Size) { mach_port_t device,iopl_dev; @@ -107,7 +107,7 @@ xf86UnMapVidMem(int ScreenNum,pointer Base,unsigned long Size) return; } -Bool +_X_EXPORT Bool xf86LinearVidMem() { return(TRUE); @@ -123,7 +123,7 @@ xf86LinearVidMem() */ extern int ioperm(unsigned long __from, unsigned long __num, int __turn_on); -Bool +_X_EXPORT Bool xf86EnableIO() { if (ioperm(0, 0x10000, 1)) { @@ -135,20 +135,20 @@ xf86EnableIO() return TRUE; } -void +_X_EXPORT void xf86DisableIO() { ioperm(0,0x10000,0); return; } -void +_X_EXPORT void xf86MapReadSideEffects(int ScreenNum, int Flags, pointer Base, unsigned long Size) { } -Bool +_X_EXPORT Bool xf86CheckMTRR(int s) { return FALSE; diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index 0c77944e1..6ccd466f6 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -333,7 +333,7 @@ error0: return NULL; } -Bool +_X_EXPORT Bool MapCurrentInt10(xf86Int10InfoPtr pInt) { pointer addr; diff --git a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c index cceda06b8..ffdc0127f 100644 --- a/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c +++ b/hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c @@ -20,7 +20,7 @@ static int vm86_rep(struct vm86_struct *ptr); static struct vm86_struct vm86_s; -Bool +_X_EXPORT Bool xf86Int10ExecSetup(xf86Int10InfoPtr pInt) { #define VM86S ((struct vm86_struct *)pInt->cpuRegs) diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index 16ac80db8..b1328cd64 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -133,7 +133,7 @@ lnxPMConfirmEventToOs(int fd, pmEvent event) #endif // HAVE_APM -PMClose +_X_EXPORT PMClose xf86OSPMOpen(void) { PMClose ret = NULL; diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index da5ca57cc..d37242ff3 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -93,7 +93,7 @@ drain_console(int fd, void *closure) tcflush(fd, TCIOFLUSH); } -void +_X_EXPORT void xf86OpenConsole(void) { int i, fd = -1; @@ -347,7 +347,7 @@ xf86OpenConsole(void) return; } -void +_X_EXPORT void xf86CloseConsole() { struct vt_mode VT; @@ -419,7 +419,7 @@ xf86CloseConsole() return; } -int +_X_EXPORT int xf86ProcessArgument(int argc, char *argv[], int i) { /* @@ -454,7 +454,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) return(0); } -void +_X_EXPORT void xf86UseMsg() { ErrorF("vtXX use the specified VT number\n"); diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 8eedfa49f..2b8356159 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -138,7 +138,7 @@ static struct pci_dev *xf86OSLinuxGetPciDevs(void) { } /* Query the kvirt address (64bit) of a BAR range from size for a given TAG */ -unsigned long +_X_EXPORT unsigned long xf86GetOSOffsetFromPCI(PCITAG tag, int space, unsigned long base) { unsigned int ndx; diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index d126e7869..b7e890ab8 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -48,14 +48,14 @@ * re-arm the signal here. All we need to do now is record the fact that * we got the signal. XFree86 handles the rest. */ -void +_X_EXPORT void xf86VTRequest(int sig) { xf86Info.vtRequestsPending = TRUE; return; } -Bool +_X_EXPORT Bool xf86VTSwitchPending(void) { return(xf86Info.vtRequestsPending ? TRUE : FALSE); @@ -69,7 +69,7 @@ xf86VTSwitchPending(void) static int sco_ledstatus = -1; static unsigned int sco_ledstate = 0; -Bool +_X_EXPORT Bool xf86VTSwitchAway(void) { ev_flush(); @@ -90,7 +90,7 @@ xf86VTSwitchAway(void) * and we need to restore the LED settings to what they were when we * switched away. */ -Bool +_X_EXPORT Bool xf86VTSwitchTo(void) { ev_resume(); diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index 5f7db3437..2f3126b53 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -42,7 +42,7 @@ static int sco_console_mode = -1; extern Bool mpxLock; -void +_X_EXPORT void xf86OpenConsole(void) { int i, ioctl_ret; @@ -192,7 +192,7 @@ xf86OpenConsole(void) * to do a soft reset on the card, which really does help settle the * video card down again after coming out of Xfree86. */ -void +_X_EXPORT void xf86CloseConsole(void) { struct vt_mode VT; @@ -224,7 +224,7 @@ xf86CloseConsole(void) close(xf86Info.consoleFd); /* We're done with the device */ } -int +_X_EXPORT int xf86ProcessArgument(int argc, char *argv[], int i) { /* @@ -283,7 +283,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) return(0); } -void +_X_EXPORT void xf86UseMsg(void) { ErrorF("vtXX use the specified VT number\n"); diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index a3cfe40b9..b43908f05 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -35,19 +35,19 @@ * No-op functions for OSs without VTs */ -Bool +_X_EXPORT Bool xf86VTSwitchPending() { return(FALSE); } -Bool +_X_EXPORT Bool xf86VTSwitchAway() { return(FALSE); } -Bool +_X_EXPORT Bool xf86VTSwitchTo() { return(TRUE); diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index 4d473147f..ea07aae8a 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -44,7 +44,7 @@ * This function is the signal handler for the VT-switching signal. It * is only referenced inside the OS-support layer. */ -void +_X_EXPORT void xf86VTRequest(int sig) { signal(sig, (void(*)(int))xf86VTRequest); @@ -52,13 +52,13 @@ xf86VTRequest(int sig) return; } -Bool +_X_EXPORT Bool xf86VTSwitchPending() { return(xf86Info.vtRequestsPending ? TRUE : FALSE); } -Bool +_X_EXPORT Bool xf86VTSwitchAway() { xf86Info.vtRequestsPending = FALSE; @@ -75,7 +75,7 @@ xf86VTSwitchAway() } } -Bool +_X_EXPORT Bool xf86VTSwitchTo() { xf86Info.vtRequestsPending = FALSE; diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c index bfac4b1c8..7601ff4af 100644 --- a/hw/xfree86/os-support/shared/pm_noop.c +++ b/hw/xfree86/os-support/shared/pm_noop.c @@ -38,7 +38,7 @@ #define XF86_OS_PRIVS #include "xf86_OSproc.h" -PMClose +_X_EXPORT PMClose xf86OSPMOpen(void) { return NULL; diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index f51131c6b..a45117da7 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -262,7 +262,7 @@ xf86UnblockSIGIO (int wasset) } } -void +_X_EXPORT void xf86AssertBlockedSIGIO (char *where) { sigset_t set, old; @@ -275,7 +275,7 @@ xf86AssertBlockedSIGIO (char *where) /* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */ -int +_X_EXPORT int xf86SIGIOSupported (void) { return 1; diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index 7113968c6..12fcab1d7 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -57,13 +57,13 @@ xf86UnblockSIGIO (int wasset) { } -void +_X_EXPORT void xf86AssertBlockedSIGIO (char *where) { } /* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */ -Bool +_X_EXPORT Bool xf86SIGIOSupported () { return FALSE; diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c index 8cb101488..405c00f17 100644 --- a/hw/xfree86/os-support/shared/stdResource.c +++ b/hw/xfree86/os-support/shared/stdResource.c @@ -48,7 +48,7 @@ #define xf86StdAccResFromOS xf86AccResFromOS #endif -resPtr +_X_EXPORT resPtr xf86StdAccResFromOS(resPtr ret) { resRange range; diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c index 0b4411604..48133d72e 100644 --- a/hw/xfree86/os-support/shared/vidmem.c +++ b/hw/xfree86/os-support/shared/vidmem.c @@ -161,7 +161,7 @@ checkMtrrOption(VidMapPtr vp) } } -void +_X_EXPORT void xf86MakeNewMapping(int ScreenNum, int Flags, unsigned long Base, unsigned long Size, pointer Vbase) { VidMapPtr vp; @@ -175,7 +175,7 @@ xf86MakeNewMapping(int ScreenNum, int Flags, unsigned long Base, unsigned long S mp->flags = Flags; } -void +_X_EXPORT void xf86InitVidMem(void) { if (!vidMemInfo.initialised) { diff --git a/hw/xfree86/os-support/solaris/sun_apm.c b/hw/xfree86/os-support/solaris/sun_apm.c index 7decc900f..d121f3304 100644 --- a/hw/xfree86/os-support/solaris/sun_apm.c +++ b/hw/xfree86/os-support/solaris/sun_apm.c @@ -199,7 +199,7 @@ sunPMConfirmEventToOs(int fd, pmEvent event) } } -PMClose +_X_EXPORT PMClose xf86OSPMOpen(void) { int fd; diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index 795b0c13c..4fe5af3ea 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -46,7 +46,7 @@ static char fb_dev[PATH_MAX] = "/dev/fb"; static char fb_dev[PATH_MAX] = "/dev/console"; #endif -void +_X_EXPORT void xf86OpenConsole(void) { int i; @@ -209,7 +209,7 @@ xf86OpenConsole(void) } } -void +_X_EXPORT void xf86CloseConsole(void) { #ifdef HAS_USL_VTS @@ -296,7 +296,7 @@ xf86CloseConsole(void) close(xf86Info.consoleFd); } -int +_X_EXPORT int xf86ProcessArgument(int argc, char **argv, int i) { /* @@ -346,7 +346,7 @@ xf86ProcessArgument(int argc, char **argv, int i) return 0; } -void xf86UseMsg() +_X_EXPORT void xf86UseMsg() { #ifdef HAS_USL_VTS ErrorF("vtXX Use the specified VT number\n"); diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index 170bb8914..afb484e5e 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -43,7 +43,7 @@ static Bool Protect0 = FALSE; static int VTnum = -1; -void +_X_EXPORT void xf86OpenConsole() { int fd; @@ -186,7 +186,7 @@ xf86OpenConsole() return; } -void +_X_EXPORT void xf86CloseConsole() { struct vt_mode VT; @@ -205,7 +205,7 @@ xf86CloseConsole() return; } -int +_X_EXPORT int xf86ProcessArgument(int argc, char *argv[], int i) { /* @@ -242,7 +242,7 @@ xf86ProcessArgument(int argc, char *argv[], int i) return(0); } -void +_X_EXPORT void xf86UseMsg() { ErrorF("vtXX use the specified VT number\n"); diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c index 216789fc1..8f5370bd3 100644 --- a/hw/xfree86/parser/Device.c +++ b/hw/xfree86/parser/Device.c @@ -357,7 +357,7 @@ xf86freeDeviceList (XF86ConfDevicePtr ptr) } } -XF86ConfDevicePtr +_X_EXPORT XF86ConfDevicePtr xf86findDevice (const char *ident, XF86ConfDevicePtr p) { while (p) @@ -370,7 +370,7 @@ xf86findDevice (const char *ident, XF86ConfDevicePtr p) return (NULL); } -char * +_X_EXPORT char * xf86configStrdup (const char *s) { char *tmp; diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c index d97a199c4..6eb48e367 100644 --- a/hw/xfree86/parser/Flags.c +++ b/hw/xfree86/parser/Flags.c @@ -216,7 +216,7 @@ addNewOption2 (XF86OptionPtr head, char *name, char *val, int used) return ((XF86OptionPtr) xf86addListItem ((glp) head, (glp) new)); } -XF86OptionPtr +_X_EXPORT XF86OptionPtr xf86addNewOption (XF86OptionPtr head, char *name, char *val) { return addNewOption2(head, name, val, 0); @@ -249,7 +249,7 @@ xf86optionListDup (XF86OptionPtr opt) return newopt; } -void +_X_EXPORT void xf86optionListFree (XF86OptionPtr opt) { XF86OptionPtr prev; @@ -265,7 +265,7 @@ xf86optionListFree (XF86OptionPtr opt) } } -char * +_X_EXPORT char * xf86optionName(XF86OptionPtr opt) { if (opt) @@ -273,7 +273,7 @@ xf86optionName(XF86OptionPtr opt) return 0; } -char * +_X_EXPORT char * xf86optionValue(XF86OptionPtr opt) { if (opt) @@ -281,7 +281,7 @@ xf86optionValue(XF86OptionPtr opt) return 0; } -XF86OptionPtr +_X_EXPORT XF86OptionPtr xf86newOption(char *name, char *value) { XF86OptionPtr opt; @@ -298,7 +298,7 @@ xf86newOption(char *name, char *value) return opt; } -XF86OptionPtr +_X_EXPORT XF86OptionPtr xf86nextOption(XF86OptionPtr list) { if (!list) @@ -312,7 +312,7 @@ xf86nextOption(XF86OptionPtr list) * NULL */ -XF86OptionPtr +_X_EXPORT XF86OptionPtr xf86findOption (XF86OptionPtr list, const char *name) { while (list) @@ -346,7 +346,7 @@ xf86findOptionValue (XF86OptionPtr list, const char *name) return (NULL); } -XF86OptionPtr +_X_EXPORT XF86OptionPtr xf86optionListCreate( const char **options, int count, int used ) { XF86OptionPtr p = NULL; @@ -383,7 +383,7 @@ xf86optionListCreate( const char **options, int count, int used ) * is used. The end result is a single valid list of options. Duplicates * are freed, and the original lists are no longer guaranteed to be complete. */ -XF86OptionPtr +_X_EXPORT XF86OptionPtr xf86optionListMerge (XF86OptionPtr head, XF86OptionPtr tail) { XF86OptionPtr a, b, ap = NULL, bp = NULL; @@ -428,7 +428,7 @@ xf86optionListMerge (XF86OptionPtr head, XF86OptionPtr tail) return (head); } -char * +_X_EXPORT char * xf86uLongToString(unsigned long i) { char *s; @@ -442,7 +442,7 @@ xf86uLongToString(unsigned long i) return s; } -XF86OptionPtr +_X_EXPORT XF86OptionPtr xf86parseOption(XF86OptionPtr head) { XF86OptionPtr option, cnew, old; @@ -493,7 +493,7 @@ xf86parseOption(XF86OptionPtr head) return (head); } -void +_X_EXPORT void xf86printOptionList(FILE *fp, XF86OptionPtr list, int tabs) { int i; diff --git a/hw/xfree86/parser/Input.c b/hw/xfree86/parser/Input.c index 3d9801968..34ce6cbea 100644 --- a/hw/xfree86/parser/Input.c +++ b/hw/xfree86/parser/Input.c @@ -189,7 +189,7 @@ xf86validateInput (XF86ConfigPtr p) return (TRUE); } -XF86ConfInputPtr +_X_EXPORT XF86ConfInputPtr xf86findInput (const char *ident, XF86ConfInputPtr p) { while (p) @@ -202,7 +202,7 @@ xf86findInput (const char *ident, XF86ConfInputPtr p) return (NULL); } -XF86ConfInputPtr +_X_EXPORT XF86ConfInputPtr xf86findInputByDriver (const char *driver, XF86ConfInputPtr p) { while (p) diff --git a/hw/xfree86/parser/Layout.c b/hw/xfree86/parser/Layout.c index 5d1348acb..03afbcc39 100644 --- a/hw/xfree86/parser/Layout.c +++ b/hw/xfree86/parser/Layout.c @@ -520,7 +520,7 @@ xf86validateLayout (XF86ConfigPtr p) return (TRUE); } -XF86ConfLayoutPtr +_X_EXPORT XF86ConfLayoutPtr xf86findLayout (const char *name, XF86ConfLayoutPtr list) { while (list) diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index 9d533125e..387307781 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/hw/xfree86/parser/Monitor.c @@ -842,7 +842,7 @@ xf86freeModesList (XF86ConfModesPtr ptr) } } -XF86ConfMonitorPtr +_X_EXPORT XF86ConfMonitorPtr xf86findMonitor (const char *ident, XF86ConfMonitorPtr p) { while (p) @@ -855,7 +855,7 @@ xf86findMonitor (const char *ident, XF86ConfMonitorPtr p) return (NULL); } -XF86ConfModesPtr +_X_EXPORT XF86ConfModesPtr xf86findModes (const char *ident, XF86ConfModesPtr p) { while (p) @@ -868,7 +868,7 @@ xf86findModes (const char *ident, XF86ConfModesPtr p) return (NULL); } -XF86ConfModeLinePtr +_X_EXPORT XF86ConfModeLinePtr xf86findModeLine (const char *ident, XF86ConfModeLinePtr p) { while (p) diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c index dfc02bb72..cd3d889c6 100644 --- a/hw/xfree86/parser/Screen.c +++ b/hw/xfree86/parser/Screen.c @@ -554,7 +554,7 @@ xf86validateScreen (XF86ConfigPtr p) return (TRUE); } -XF86ConfScreenPtr +_X_EXPORT XF86ConfScreenPtr xf86findScreen (const char *ident, XF86ConfScreenPtr p) { while (p) diff --git a/hw/xfree86/parser/Video.c b/hw/xfree86/parser/Video.c index a8912cf44..2c9c8a0f7 100644 --- a/hw/xfree86/parser/Video.c +++ b/hw/xfree86/parser/Video.c @@ -282,7 +282,7 @@ xf86freeVideoAdaptorList (XF86ConfVideoAdaptorPtr ptr) } } -XF86ConfVideoAdaptorPtr +_X_EXPORT XF86ConfVideoAdaptorPtr xf86findVideoAdaptor (const char *ident, XF86ConfVideoAdaptorPtr p) { while (p) diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c index b044a6af8..748a2ca3c 100644 --- a/hw/xfree86/parser/read.c +++ b/hw/xfree86/parser/read.c @@ -90,7 +90,7 @@ xf86validateConfig (XF86ConfigPtr p) return (TRUE); } -XF86ConfigPtr +_X_EXPORT XF86ConfigPtr xf86readConfigFile (void) { int token; @@ -240,7 +240,7 @@ xf86readConfigFile (void) * A pointer to the head of the list is returned to handle the addition of * the first item. */ -GenericListPtr +_X_EXPORT GenericListPtr xf86addListItem (GenericListPtr head, GenericListPtr new) { GenericListPtr p = head; @@ -265,7 +265,7 @@ xf86addListItem (GenericListPtr head, GenericListPtr new) * Test if one chained list contains the other. * In this case both list have the same endpoint (provided they don't loop) */ -int +_X_EXPORT int xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2) { GenericListPtr p = list_1; @@ -285,7 +285,7 @@ xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2) return (!(last_1 == last_2)); } -void +_X_EXPORT void xf86freeConfig (XF86ConfigPtr p) { if (p == NULL) diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index 7f10c0daa..4d7508773 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -522,7 +522,7 @@ xf86tokenString (void) return configRBuf; } -int +_X_EXPORT int xf86pathIsAbsolute(const char *path) { if (path && path[0] == '/') @@ -531,7 +531,7 @@ xf86pathIsAbsolute(const char *path) } /* A path is "safe" if it is relative and if it contains no ".." elements. */ -int +_X_EXPORT int xf86pathIsSafe(const char *path) { if (xf86pathIsAbsolute(path)) @@ -777,7 +777,7 @@ DoSubstitution(const char *template, const char *cmdline, const char *projroot, "%P/lib/X11/%X" #endif -const char * +_X_EXPORT const char * xf86openConfigFile(const char *path, const char *cmdline, const char *projroot) { char *pathcopy; @@ -854,7 +854,7 @@ xf86openConfigFile(const char *path, const char *cmdline, const char *projroot) return configPath; } -void +_X_EXPORT void xf86closeConfigFile (void) { xf86conffree (configPath); @@ -873,7 +873,7 @@ xf86closeConfigFile (void) } } -void +_X_EXPORT void xf86setBuiltinConfig(const char *config[]) { builtinConfig = config; @@ -982,7 +982,7 @@ xf86nameCompare (const char *s1, const char *s2) return (c1 - c2); } -char * +_X_EXPORT char * xf86addComment(char *cur, char *add) { char *str; diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c index 3b77b9314..6b1eac94a 100644 --- a/hw/xfree86/parser/write.c +++ b/hw/xfree86/parser/write.c @@ -137,7 +137,7 @@ doWriteConfigFile (const char *filename, XF86ConfigPtr cptr) #ifndef HAS_NO_UIDS -int +_X_EXPORT int xf86writeConfigFile (const char *filename, XF86ConfigPtr cptr) { int ret; diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h index 183b85720..51b8de6ef 100644 --- a/hw/xfree86/parser/xf86Optrec.h +++ b/hw/xfree86/parser/xf86Optrec.h @@ -65,6 +65,8 @@ #define _xf86Optrec_h_ #include <stdio.h> +#include <X11/Xfuncproto.h> + /* * all records that need to be linked lists should contain a GenericList as * their first field. diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index dc1bcd59d..28e82b1ed 100644 --- a/hw/xfree86/ramdac/BT.c +++ b/hw/xfree86/ramdac/BT.c @@ -35,7 +35,7 @@ #include "BTPriv.h" #include "xf86RamDacPriv.h" -void +_X_EXPORT void BTramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -50,7 +50,7 @@ BTramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, ramdacReg->DacRegs[i]); } -void +_X_EXPORT void BTramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -137,7 +137,7 @@ BTramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/*, RamDacRecP return ramdacHelperPtr; } -void +_X_EXPORT void BTramdacSetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) { /* We need to deal with Direct Colour visuals for 8bpp and other diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index a789b69d2..e45bd949c 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -171,7 +171,7 @@ IBMramdac526CalculateMNPCForClock( return (ActualClock); } -void +_X_EXPORT void IBMramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -200,7 +200,7 @@ IBMramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, (*ramdacPtr->WriteData)(pScrn, ramdacReg->DAC[i]); } -void +_X_EXPORT void IBMramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -318,7 +318,7 @@ IBMramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs/* , RamDacRe return ramdacHelperPtr; } -void +_X_EXPORT void IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) { ramdacReg->DacRegs[IBMRGB_key_control] = 0x00; /* Disable Chroma Key */ @@ -380,7 +380,7 @@ _X_EXPORT IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void) { return IBMramdac526SetBpp; } -void +_X_EXPORT void IBMramdac640SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) { unsigned char bpp = 0x00; @@ -606,7 +606,7 @@ IBMramdac640UseHWCursor(ScreenPtr pScr, CursorPtr pCurs) return TRUE; } -void +_X_EXPORT void IBMramdac526HWCursorInit(xf86CursorInfoPtr infoPtr) { infoPtr->MaxWidth = 64; @@ -622,7 +622,7 @@ IBMramdac526HWCursorInit(xf86CursorInfoPtr infoPtr) infoPtr->UseHWCursor = IBMramdac526UseHWCursor; } -void +_X_EXPORT void IBMramdac640HWCursorInit(xf86CursorInfoPtr infoPtr) { infoPtr->MaxWidth = 64; diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index c77121ba7..fdc695202 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -123,7 +123,7 @@ TIramdacCalculateMNPForClock( return (ActualClock); } -void +_X_EXPORT void TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -225,7 +225,7 @@ TIramdacRestore(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, #endif } -void +_X_EXPORT void TIramdacSave(ScrnInfoPtr pScrn, RamDacRecPtr ramdacPtr, RamDacRegRecPtr ramdacReg) { @@ -353,7 +353,7 @@ TIramdacProbe(ScrnInfoPtr pScrn, RamDacSupportedInfoRecPtr ramdacs) return ramdacHelperPtr; } -void +_X_EXPORT void TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) { switch (pScrn->bitsPerPixel) { @@ -470,7 +470,7 @@ TIramdac3026SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) } } -void +_X_EXPORT void TIramdac3030SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg) { switch (pScrn->bitsPerPixel) { @@ -660,7 +660,7 @@ TIramdacUseHWCursor(ScreenPtr pScr, CursorPtr pCurs) return TRUE; } -void +_X_EXPORT void TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr) { infoPtr->MaxWidth = 64; @@ -676,7 +676,7 @@ TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr) infoPtr->UseHWCursor = TIramdacUseHWCursor; } -void TIramdacLoadPalette( +_X_EXPORT void TIramdacLoadPalette( ScrnInfoPtr pScrn, int numColors, int *indices, diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index ee191d3a7..360cd479f 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -33,8 +33,8 @@ #include "xf86RamDacPriv.h" -int RamDacHWPrivateIndex = -1; -int RamDacScreenPrivateIndex = -1; +_X_EXPORT int RamDacHWPrivateIndex = -1; +_X_EXPORT int RamDacScreenPrivateIndex = -1; _X_EXPORT RamDacRecPtr RamDacCreateInfoRec() @@ -62,7 +62,7 @@ RamDacDestroyInfoRec(RamDacRecPtr infoRec) xfree(infoRec); } -void +_X_EXPORT void RamDacHelperDestroyInfoRec(RamDacHelperRecPtr infoRec) { xfree(infoRec); @@ -147,7 +147,7 @@ RamDacGetHWIndex() return RamDacHWPrivateIndex; } -int +_X_EXPORT int RamDacGetScreenIndex() { return RamDacScreenPrivateIndex; diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 9a80f23dc..1322962fd 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -787,7 +787,7 @@ VBESetDisplayStart(vbeInfoPtr pVbe, int x, int y, Bool wait_retrace) return (TRUE); } -Bool +_X_EXPORT Bool VBEGetDisplayStart(vbeInfoPtr pVbe, int *x, int *y) { pVbe->pInt10->num = 0x10; @@ -891,7 +891,7 @@ VBESetGetPaletteData(vbeInfoPtr pVbe, Bool set, int first, int num, return (data); } -VBEpmi * +_X_EXPORT VBEpmi * VBEGetVBEpmi(vbeInfoPtr pVbe) { VBEpmi *pmi; @@ -977,7 +977,7 @@ VBECalcVbeModeIndex(vbeModeInfoPtr m, DisplayModePtr mode, int bpp) } #endif -void +_X_EXPORT void VBEVesaSaveRestore(vbeInfoPtr pVbe, vbeSaveRestorePtr vbe_sr, vbeSaveRestoreFunction function) { @@ -1074,7 +1074,7 @@ VBEDPMSSet(vbeInfoPtr pVbe, int mode) return (R16(pVbe->pInt10->ax) == 0x4f); } -void +_X_EXPORT void VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data) { ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; @@ -1103,7 +1103,7 @@ VBEInterpretPanelID(int scrnIndex, struct vbePanelID *data) xfree(mode); } -struct vbePanelID * +_X_EXPORT struct vbePanelID * VBEReadPanelID(vbeInfoPtr pVbe) { int RealOff = pVbe->real_mode_base; diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index 1703c6a12..85b15d5eb 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -725,7 +725,7 @@ vgaHWSeqReset(vgaHWPtr hwp, Bool start) } -void +_X_EXPORT void vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore) { #if SAVE_TEXT || SAVE_FONT1 || SAVE_FONT2 @@ -839,7 +839,7 @@ vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore) } -void +_X_EXPORT void vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore) { vgaHWPtr hwp = VGAHWPTR(scrninfp); @@ -871,7 +871,7 @@ vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore) } -void +_X_EXPORT void vgaHWRestoreColormap(ScrnInfoPtr scrninfp, vgaRegPtr restore) { vgaHWPtr hwp = VGAHWPTR(scrninfp); @@ -910,7 +910,7 @@ vgaHWRestore(ScrnInfoPtr scrninfp, vgaRegPtr restore, int flags) vgaHWRestoreColormap(scrninfp, restore); } -void +_X_EXPORT void vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save) { #if SAVE_TEXT || SAVE_FONT1 || SAVE_FONT2 @@ -1011,7 +1011,7 @@ vgaHWSaveFonts(ScrnInfoPtr scrninfp, vgaRegPtr save) #endif /* SAVE_TEXT || SAVE_FONT1 || SAVE_FONT2 */ } -void +_X_EXPORT void vgaHWSaveMode(ScrnInfoPtr scrninfp, vgaRegPtr save) { vgaHWPtr hwp = VGAHWPTR(scrninfp); @@ -1055,7 +1055,7 @@ vgaHWSaveMode(ScrnInfoPtr scrninfp, vgaRegPtr save) } -void +_X_EXPORT void vgaHWSaveColormap(ScrnInfoPtr scrninfp, vgaRegPtr save) { vgaHWPtr hwp = VGAHWPTR(scrninfp); @@ -1544,7 +1544,7 @@ vgaHWAllocDefaultRegs(vgaRegPtr regp) } -Bool +_X_EXPORT Bool vgaHWSetRegCounts(ScrnInfoPtr scrp, int numCRTC, int numSequencer, int numGraphics, int numAttribute) { @@ -1837,7 +1837,7 @@ vgaHWEnable(vgaHWPtr hwp) } -void +_X_EXPORT void vgaHWDisable(vgaHWPtr hwp) { hwp->writeEnable(hwp, hwp->readEnable(hwp) & ~0x01); @@ -1940,7 +1940,7 @@ struct _vgaDdcSave { unsigned char msr; }; -void +_X_EXPORT void vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed) { vgaHWPtr hwp = VGAHWPTR(pScrn); diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index ebba74e55..5830147a6 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -22,7 +22,7 @@ #include "xaalocal.h" -RegionPtr +_X_EXPORT RegionPtr XAABitBlt( DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c index f7ae78d3f..cda16870a 100644 --- a/hw/xfree86/xaa/xaaBitmap.c +++ b/hw/xfree86/xaa/xaaBitmap.c @@ -255,7 +255,7 @@ BitmapScanline_Shifted_Inverted_Careful( avoid the invert. */ -void +_X_EXPORT void #ifdef TRIPLE_BITS EXPNAME(XAAWriteBitmapColorExpand3)( #else @@ -373,7 +373,7 @@ SECOND_PASS: #ifndef FIXEDBASE -void +_X_EXPORT void #ifdef TRIPLE_BITS EXPNAME(XAAWriteBitmapScanlineColorExpand3)( #else diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 6c991e100..846cb22eb 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -21,7 +21,7 @@ */ -RegionPtr +_X_EXPORT RegionPtr XAACopyArea( DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, @@ -74,7 +74,7 @@ XAACopyArea( } -void +_X_EXPORT void XAADoBitBlt( DrawablePtr pSrc, DrawablePtr pDst, @@ -193,7 +193,7 @@ XAADoBitBlt( } -void +_X_EXPORT void XAADoImageWrite( DrawablePtr pSrc, DrawablePtr pDst, @@ -222,7 +222,7 @@ XAADoImageWrite( } -void +_X_EXPORT void XAADoImageRead( DrawablePtr pSrc, DrawablePtr pDst, @@ -252,7 +252,7 @@ XAADoImageRead( } -void +_X_EXPORT void XAAScreenToScreenBitBlt( ScrnInfoPtr pScrn, int nbox, diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index aa4c0407c..d8ad14473 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -39,7 +39,7 @@ static void XAACopyPlaneNtoNColorExpand(DrawablePtr pSrc, DrawablePtr pDst, static unsigned long TmpBitPlane; -RegionPtr +_X_EXPORT RegionPtr XAACopyPlaneColorExpansion( DrawablePtr pSrc, DrawablePtr pDst, @@ -159,7 +159,7 @@ ALLOC_FAILED: } } -void +_X_EXPORT void XAAPushPixelsSolidColorExpansion( GCPtr pGC, PixmapPtr pBitMap, diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index ecdc9a3be..38cbe17b4 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -21,7 +21,7 @@ Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net). */ -void +_X_EXPORT void XAACopyWindow( WindowPtr pWin, DDXPointRec ptOldOrg, diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index 63233e05d..9621738f1 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -18,7 +18,7 @@ #include "xaalocal.h" -void +_X_EXPORT void #ifdef POLYSEGMENT XAAPolySegmentDashed( DrawablePtr pDrawable, diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index fd2adbde7..42d9fd555 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -332,7 +332,7 @@ XAAPushPixelsFallback( XAA_GC_OP_EPILOGUE(pGC); } -GCOps XAAFallbackOps = { +_X_EXPORT GCOps XAAFallbackOps = { XAAFillSpansFallback, XAASetSpansFallback, XAAPutImageFallback, XAACopyAreaFallback, XAACopyPlaneFallback, XAAPolyPointFallback, diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index d3ebc22fc..33d79b822 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -160,7 +160,7 @@ XAAFillArcSliceSolid(DrawablePtr pDraw, GCPtr pGC, xArc *arc) } -void +_X_EXPORT void XAAPolyFillArcSolid(pDraw, pGC, narcs, parcs) DrawablePtr pDraw; GCPtr pGC; diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 6f11e35ff..138c5a17a 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -115,7 +115,7 @@ extents. */ -int +_X_EXPORT int XAAIsEasyPolygon( DDXPointPtr ptsIn, int count, @@ -194,7 +194,7 @@ XAAIsEasyPolygon( return POLY_IS_EASY; } -void +_X_EXPORT void XAAFillPolygonSolid( DrawablePtr pDraw, GCPtr pGC, @@ -343,7 +343,7 @@ XAAFillPolygonSolid( -void +_X_EXPORT void XAAFillPolygonHelper( ScrnInfoPtr pScrn, DDXPointPtr ptsIn, @@ -658,7 +658,7 @@ CacheBltRectHelper ( \**********************/ -void +_X_EXPORT void XAAFillPolygonStippled( DrawablePtr pDraw, GCPtr pGC, @@ -818,7 +818,7 @@ XAAFillPolygonStippled( \*******************/ -void +_X_EXPORT void XAAFillPolygonTiled( DrawablePtr pDraw, GCPtr pGC, diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index cccd1fcc2..d4449f6cb 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -24,7 +24,7 @@ static void XAARenderCacheBltRects(GCPtr, int, BoxPtr, int, int); static void XAARenderImageWriteRects(GCPtr, int, BoxPtr, int, int); static void XAARenderPixmapCopyRects(GCPtr, int, BoxPtr, int, int); -void +_X_EXPORT void XAAPolyFillRect( DrawablePtr pDraw, GCPtr pGC, @@ -399,7 +399,7 @@ XAAFillSolidRects( \*********************/ -void +_X_EXPORT void XAAFillMono8x8PatternRectsScreenOrigin( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -449,7 +449,7 @@ XAAFillMono8x8PatternRectsScreenOrigin( SET_SYNC_FLAG(infoRec); } -void +_X_EXPORT void XAAFillMono8x8PatternRects( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -511,7 +511,7 @@ XAAFillMono8x8PatternRects( \**********************/ -void +_X_EXPORT void XAAFillColor8x8PatternRectsScreenOrigin( ScrnInfoPtr pScrn, int rop, @@ -546,7 +546,7 @@ XAAFillColor8x8PatternRectsScreenOrigin( SET_SYNC_FLAG(infoRec); } -void +_X_EXPORT void XAAFillColor8x8PatternRects( ScrnInfoPtr pScrn, int rop, @@ -587,7 +587,7 @@ XAAFillColor8x8PatternRects( | Cache Blits | \***************/ -void +_X_EXPORT void XAAFillCacheBltRects( ScrnInfoPtr pScrn, int rop, @@ -709,7 +709,7 @@ XAAFillCacheBltRects( -void +_X_EXPORT void XAAFillCacheExpandRects( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -873,7 +873,7 @@ WriteColumn( } } -void +_X_EXPORT void XAAFillImageWriteRects( ScrnInfoPtr pScrn, int rop, @@ -928,7 +928,7 @@ XAAFillImageWriteRects( \*************/ -void +_X_EXPORT void XAAClipAndRenderRects( GCPtr pGC, ClipAndRenderRectsFunc BoxFunc, @@ -1018,7 +1018,7 @@ XAAClipAndRenderRects( } -int +_X_EXPORT int XAAGetRectClipBoxes( GCPtr pGC, BoxPtr pboxClippedBase, diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index e6083d529..46471ec84 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -27,14 +27,14 @@ static void XAAChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects); static void XAADestroyClip(GCPtr pGC); static void XAACopyClip(GCPtr pgcDst, GCPtr pgcSrc); -GCFuncs XAAGCFuncs = { +_X_EXPORT GCFuncs XAAGCFuncs = { XAAValidateGC, XAAChangeGC, XAACopyGC, XAADestroyGC, XAAChangeClip, XAADestroyClip, XAACopyClip }; extern GCOps XAAPixmapOps; -Bool +_X_EXPORT Bool XAACreateGC(GCPtr pGC) { ScreenPtr pScreen = pGC->pScreen; diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index 5823cc064..0946072e5 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -19,7 +19,7 @@ #include "gcstruct.h" #include "pixmapstr.h" -void +_X_EXPORT void XAAValidateCopyArea( GCPtr pGC, unsigned long changes, @@ -37,7 +37,7 @@ XAAValidateCopyArea( pGC->ops->CopyArea = XAAFallbackOps.CopyArea; } -void +_X_EXPORT void XAAValidatePutImage( GCPtr pGC, unsigned long changes, @@ -56,7 +56,7 @@ XAAValidatePutImage( pGC->ops->PutImage = XAAFallbackOps.PutImage; } -void +_X_EXPORT void XAAValidateCopyPlane( GCPtr pGC, unsigned long changes, @@ -75,7 +75,7 @@ XAAValidateCopyPlane( pGC->ops->CopyPlane = XAAFallbackOps.CopyPlane; } -void +_X_EXPORT void XAAValidatePushPixels( GCPtr pGC, unsigned long changes, @@ -106,7 +106,7 @@ XAAValidatePushPixels( Validate functions if it breaks this assumption */ -void +_X_EXPORT void XAAValidateFillSpans( GCPtr pGC, unsigned long changes, @@ -182,7 +182,7 @@ XAAValidateFillSpans( these, it will need to supply a new Validate functions if it breaks this assumption */ -void +_X_EXPORT void XAAValidatePolyGlyphBlt( GCPtr pGC, unsigned long changes, @@ -237,7 +237,7 @@ XAAValidatePolyGlyphBlt( } } -void +_X_EXPORT void XAAValidateImageGlyphBlt( GCPtr pGC, unsigned long changes, @@ -298,7 +298,7 @@ XAAValidateImageGlyphBlt( } -void +_X_EXPORT void XAAValidatePolylines( GCPtr pGC, unsigned long changes, diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index 28bec7a98..29ab1c0da 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -16,7 +16,7 @@ #include "xaa.h" #include "xaalocal.h" -void XAAMoveDWORDS_FixedBase( +_X_EXPORT void XAAMoveDWORDS_FixedBase( register CARD32* dest, register CARD32* src, register int dwords ) @@ -60,7 +60,7 @@ _X_EXPORT void XAAMoveDWORDS( *(dest + 2) = *(src + 2); } -void XAAMoveDWORDS_FixedSrc( +_X_EXPORT void XAAMoveDWORDS_FixedSrc( register CARD32* dest, register CARD32* src, register int dwords ) @@ -172,7 +172,7 @@ XAAWritePixmap32To24( } -void +_X_EXPORT void XAAWritePixmap ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -305,7 +305,7 @@ BAD_ALIGNMENT: } -void +_X_EXPORT void XAAWritePixmapScanline ( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -388,7 +388,7 @@ BAD_ALIGNMENT: } -void +_X_EXPORT void XAAPutImage( DrawablePtr pDraw, GCPtr pGC, diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index 331945b38..dbd91a21d 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -57,7 +57,7 @@ _X_EXPORT DevPrivateKey XAAGetGCKey(void) { return XAAGCKey; } -DevPrivateKey XAAGetPixmapKey(void) { +_X_EXPORT DevPrivateKey XAAGetPixmapKey(void) { return XAAPixmapKey; } diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c index 40871424a..d8b2e9573 100644 --- a/hw/xfree86/xaa/xaaInitAccel.c +++ b/hw/xfree86/xaa/xaaInitAccel.c @@ -109,7 +109,7 @@ static XF86ModuleVersionInfo xaaVersRec = _X_EXPORT XF86ModuleData xaaModuleData = { &xaaVersRec, NULL, NULL }; -Bool +_X_EXPORT Bool XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) { int index = pScreen->myNum; diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index cefb59a8e..4e19b5529 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -15,7 +15,7 @@ #include "xaalocal.h" -void +_X_EXPORT void XAASolidHorVertLineAsRects( ScrnInfoPtr pScrn, int x, int y, int len, int dir @@ -29,7 +29,7 @@ XAASolidHorVertLineAsRects( } -void +_X_EXPORT void XAASolidHorVertLineAsTwoPoint( ScrnInfoPtr pScrn, int x, int y, int len, int dir @@ -44,7 +44,7 @@ XAASolidHorVertLineAsTwoPoint( (*infoRec->SubsequentSolidTwoPointLine)(pScrn, x, y, x, y + len, 0); } -void +_X_EXPORT void XAASolidHorVertLineAsBresenham( ScrnInfoPtr pScrn, int x, int y, int len, int dir @@ -60,7 +60,7 @@ XAASolidHorVertLineAsBresenham( } -void +_X_EXPORT void XAAComputeDash(GCPtr pGC) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c index 556650fb0..e291e3187 100644 --- a/hw/xfree86/xaa/xaaNonTEGlyph.c +++ b/hw/xfree86/xaa/xaaNonTEGlyph.c @@ -37,7 +37,7 @@ /* if the backing rectangle and text are of the same dimensions then we can draw in one pass */ -void +_X_EXPORT void #ifdef TRIPLE_BITS EXPNAME(XAANonTEGlyphRenderer3)( #else @@ -90,7 +90,7 @@ EXPNAME(XAANonTEGlyphRenderer)( #ifndef FIXEDBASE /* Scanline version of above gets built for LSBFIRST and MSBFIRST */ -void +_X_EXPORT void #ifdef TRIPLE_BITS EXPNAME(XAANonTEGlyphRendererScanline3)( #else diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index d32c0bbc5..f8f79ca4e 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -58,7 +58,7 @@ static int PolyGlyphBltNonTEColorExpansion(ScrnInfoPtr pScrn, ********************************************************************/ -int +_X_EXPORT int XAAPolyText8NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -86,7 +86,7 @@ XAAPolyText8NonTEColorExpansion( } -int +_X_EXPORT int XAAPolyText16NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -116,7 +116,7 @@ XAAPolyText16NonTEColorExpansion( } -void +_X_EXPORT void XAAImageText8NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -141,7 +141,7 @@ XAAImageText8NonTEColorExpansion( } -void +_X_EXPORT void XAAImageText16NonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -177,7 +177,7 @@ XAAImageText16NonTEColorExpansion( ********************************************************************/ -void +_X_EXPORT void XAAImageGlyphBltNonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -197,7 +197,7 @@ XAAImageGlyphBltNonTEColorExpansion( pGC->pCompositeClip, nglyph, (unsigned char*)pglyphBase, ppci); } -void +_X_EXPORT void XAAPolyGlyphBltNonTEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -541,7 +541,7 @@ PolyGlyphBltNonTEColorExpansion( indicates that part of the text string's bounding box is visible but not necessarily that any of the characters are visible */ -void XAANonTEGlyphRenderer( +_X_EXPORT void XAANonTEGlyphRenderer( ScrnInfoPtr pScrn, int x, int y, int n, NonTEGlyphPtr glyphs, diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index 7c9d53270..3d88e5851 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -27,7 +27,7 @@ #include "xf86fbman.h" #include "servermd.h" -void +_X_EXPORT void XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); @@ -44,7 +44,7 @@ XAAMoveOutOffscreenPixmaps(ScreenPtr pScreen) -void +_X_EXPORT void XAAMoveInOffscreenPixmaps(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); @@ -103,7 +103,7 @@ XAAMoveInOffscreenPixmaps(ScreenPtr pScreen) } -void +_X_EXPORT void XAARemoveAreaCallback(FBAreaPtr area) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(area->pScreen); @@ -117,7 +117,7 @@ XAARemoveAreaCallback(FBAreaPtr area) DELIST_OFFSCREEN_PIXMAP(pPix); } -void +_X_EXPORT void XAAMoveOutOffscreenPixmap(PixmapPtr pPix) { ScreenPtr pScreen = pPix->drawable.pScreen; diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 273183e10..a104e7451 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -112,7 +112,7 @@ XAASetColorKey8_32( SET_SYNC_FLAG(infoRec); } -void +_X_EXPORT void XAASetupOverlay8_32Planar(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index 069d81838..76d3f80fc 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -160,7 +160,7 @@ FreePixmapCachePrivate(XAAPixmapCachePrivatePtr pPriv) xfree(pPriv); } -void +_X_EXPORT void XAAClosePixmapCache(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); @@ -630,7 +630,7 @@ GOT_EM: } -void +_X_EXPORT void XAAInitPixmapCache( ScreenPtr pScreen, RegionPtr areas, @@ -1097,7 +1097,7 @@ static CARD32 StippleMasks[4] = { }; #endif -Bool +_X_EXPORT Bool XAACheckStippleReducibility(PixmapPtr pPixmap) { XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap); @@ -1195,7 +1195,7 @@ XAACheckStippleReducibility(PixmapPtr pPixmap) } -Bool +_X_EXPORT Bool XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono) { XAAPixmapPtr pPriv = XAA_GET_PIXMAP_PRIVATE(pPixmap); @@ -1401,7 +1401,7 @@ XAACheckTileReducibility(PixmapPtr pPixmap, Bool checkMono) } -void XAATileCache( +_X_EXPORT void XAATileCache( ScrnInfoPtr pScrn, XAACacheInfoPtr pCache, int w, int h @@ -1433,7 +1433,7 @@ void XAATileCache( SET_SYNC_FLAG(infoRec); } -XAACacheInfoPtr +_X_EXPORT XAACacheInfoPtr XAACacheTile(ScrnInfoPtr pScrn, PixmapPtr pPix) { int w = pPix->drawable.width; @@ -1495,7 +1495,7 @@ XAACacheTile(ScrnInfoPtr pScrn, PixmapPtr pPix) return pCache; } -XAACacheInfoPtr +_X_EXPORT XAACacheInfoPtr XAACacheMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix) { int w = pPix->drawable.width; @@ -1593,7 +1593,7 @@ XAACacheMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix) return pCache; } -XAACacheInfoPtr +_X_EXPORT XAACacheInfoPtr XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix) { int w = pPix->drawable.width; @@ -1658,9 +1658,12 @@ XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix) } _X_EXPORT XAACachePlanarMonoStippleProc -XAAGetCachePlanarMonoStipple(void) { return XAACachePlanarMonoStipple; } +_X_EXPORT XAAGetCachePlanarMonoStipple(void) +{ + return XAACachePlanarMonoStipple; +} -XAACacheInfoPtr +_X_EXPORT XAACacheInfoPtr XAACacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg) { int w = pPix->drawable.width; @@ -1739,7 +1742,7 @@ XAACacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg) -XAACacheInfoPtr +_X_EXPORT XAACacheInfoPtr XAACacheMono8x8Pattern(ScrnInfoPtr pScrn, int pat0, int pat1) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); @@ -1770,7 +1773,7 @@ XAACacheMono8x8Pattern(ScrnInfoPtr pScrn, int pat0, int pat1) -XAACacheInfoPtr +_X_EXPORT XAACacheInfoPtr XAACacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCRNINFOPTR(pScrn); @@ -1840,7 +1843,7 @@ XAACacheColor8x8Pattern(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg) } -void +_X_EXPORT void XAAWriteBitmapToCache( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1854,7 +1857,7 @@ XAAWriteBitmapToCache( 0, fg, bg, GXcopy, ~0); } -void +_X_EXPORT void XAAWriteBitmapToCacheLinear( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1892,7 +1895,7 @@ XAAWriteBitmapToCacheLinear( } -void +_X_EXPORT void XAAWritePixmapToCache( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1908,7 +1911,7 @@ XAAWritePixmapToCache( -void +_X_EXPORT void XAAWritePixmapToCacheLinear( ScrnInfoPtr pScrn, int x, int y, int w, int h, @@ -1952,7 +1955,7 @@ XAAWritePixmapToCacheLinear( } -void +_X_EXPORT void XAAWriteMono8x8PatternToCache( ScrnInfoPtr pScrn, XAACacheInfoPtr pCache @@ -1994,7 +1997,7 @@ XAAWriteMono8x8PatternToCache( xfree(data); } -void +_X_EXPORT void XAAWriteColor8x8PatternToCache( ScrnInfoPtr pScrn, PixmapPtr pPix, @@ -2090,7 +2093,7 @@ XAAWriteColor8x8PatternToCache( -int +_X_EXPORT int XAAStippledFillChooser(GCPtr pGC) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); @@ -2175,7 +2178,7 @@ XAAStippledFillChooser(GCPtr pGC) } -int +_X_EXPORT int XAAOpaqueStippledFillChooser(GCPtr pGC) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); @@ -2250,7 +2253,7 @@ XAAOpaqueStippledFillChooser(GCPtr pGC) -int +_X_EXPORT int XAATiledFillChooser(GCPtr pGC) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); @@ -2323,7 +2326,7 @@ static int RotateMasksY[4] = { 0xFFFFFFFF, 0x00FFFFFF, 0x0000FFFF, 0x000000FF }; -void +_X_EXPORT void XAARotateMonoPattern( int *pat0, int *pat1, int xorg, int yorg, @@ -2352,7 +2355,7 @@ XAARotateMonoPattern( -void +_X_EXPORT void XAAInvalidatePixmapCache(ScreenPtr pScreen) { XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index e7d62a656..16f49b996 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -48,7 +48,7 @@ #include "xf86fbman.h" #include "servermd.h" -Bool +_X_EXPORT Bool XAAGetPixelFromRGBA ( CARD32 *pixel, CARD16 red, @@ -91,7 +91,7 @@ XAAGetPixelFromRGBA ( } -Bool +_X_EXPORT Bool XAAGetRGBAFromPixel( CARD32 pixel, CARD16 *red, @@ -180,7 +180,7 @@ XAA_888_plus_PICT_a8_to_8888 ( (pDraw->type == DRAWABLE_WINDOW || \ (pDraw->type == DRAWABLE_PIXMAP && IS_OFFSCREEN_PIXMAP(pDraw))) -Bool +_X_EXPORT Bool XAADoComposite ( CARD8 op, PicturePtr pSrc, @@ -494,7 +494,7 @@ XAACompositeSrcCopy (PicturePtr pSrc, return; } -void +_X_EXPORT void XAAComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, @@ -562,7 +562,7 @@ XAAComposite (CARD8 op, XAA_RENDER_EPILOGUE(pScreen, Composite, XAAComposite); } -Bool +_X_EXPORT Bool XAADoGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, @@ -607,7 +607,7 @@ XAADoGlyphs (CARD8 op, } -void +_X_EXPORT void XAAGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst, diff --git a/hw/xfree86/xaa/xaaROP.c b/hw/xfree86/xaa/xaaROP.c index b315e02ed..e05453f22 100644 --- a/hw/xfree86/xaa/xaaROP.c +++ b/hw/xfree86/xaa/xaaROP.c @@ -14,7 +14,7 @@ #include "xaalocal.h" -int XAACopyROP[16] = +_X_EXPORT int XAACopyROP[16] = { ROP_0, /* GXclear */ ROP_DSa, /* GXand */ @@ -34,7 +34,7 @@ int XAACopyROP[16] = ROP_1 /* GXset */ }; -int XAACopyROP_PM[16] = +_X_EXPORT int XAACopyROP_PM[16] = { ROP_0, /* not used */ ROP_DSPnoa, @@ -55,7 +55,7 @@ int XAACopyROP_PM[16] = }; -int XAAPatternROP[16]= +_X_EXPORT int XAAPatternROP[16]= { ROP_0, ROP_DPa, @@ -75,7 +75,7 @@ int XAAPatternROP[16]= ROP_1 }; -int XAAPatternROP_PM[16] = +_X_EXPORT int XAAPatternROP_PM[16] = { ROP_DPna, ROP_DPSnoa, diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index 0a7e174b7..35acdb060 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -20,7 +20,7 @@ */ -void +_X_EXPORT void XAAPolyRectangleThinSolid( DrawablePtr pDrawable, GCPtr pGC, diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 7d0943d72..a3859bf8b 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -32,7 +32,7 @@ static void XAARenderCacheExpandSpans( static void XAARenderPixmapCopySpans( GCPtr, int, DDXPointPtr, int*, int, int, int); -void +_X_EXPORT void XAAFillSpans( DrawablePtr pDraw, GC *pGC, @@ -396,7 +396,7 @@ XAARenderPixmapCopySpans( \****************/ -void +_X_EXPORT void XAAFillSolidSpans( ScrnInfoPtr pScrn, int fg, int rop, @@ -432,7 +432,7 @@ XAAFillSolidSpans( \***************/ -void +_X_EXPORT void XAAFillMono8x8PatternSpansScreenOrigin( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -491,7 +491,7 @@ XAAFillMono8x8PatternSpansScreenOrigin( } -void +_X_EXPORT void XAAFillMono8x8PatternSpans( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -559,7 +559,7 @@ XAAFillMono8x8PatternSpans( \****************/ -void +_X_EXPORT void XAAFillColor8x8PatternSpansScreenOrigin( ScrnInfoPtr pScrn, int rop, @@ -605,7 +605,7 @@ XAAFillColor8x8PatternSpansScreenOrigin( } -void +_X_EXPORT void XAAFillColor8x8PatternSpans( ScrnInfoPtr pScrn, int rop, @@ -654,7 +654,7 @@ XAAFillColor8x8PatternSpans( \*****************/ -void +_X_EXPORT void XAAFillCacheBltSpans( ScrnInfoPtr pScrn, int rop, @@ -713,7 +713,7 @@ XAAFillCacheBltSpans( \****************/ -void +_X_EXPORT void XAAFillCacheExpandSpans( ScrnInfoPtr pScrn, int fg, int bg, int rop, @@ -774,7 +774,7 @@ XAAFillCacheExpandSpans( -void +_X_EXPORT void XAAClipAndRenderSpans( GCPtr pGC, DDXPointPtr ppt, diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index 57d8aa318..c88c79cd6 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -1497,7 +1497,7 @@ static Bool XAAStateWrapSetupForCPUToScreenTexture2(ScrnInfoPtr pScrn, int op, #endif /* Setup Function */ -Bool +_X_EXPORT Bool XAAInitStateWrap(ScreenPtr pScreen, XAAInfoRecPtr infoRec) { ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c index 4735f78d2..de877d274 100644 --- a/hw/xfree86/xaa/xaaStipple.c +++ b/hw/xfree86/xaa/xaaStipple.c @@ -23,7 +23,7 @@ static CARD32* StippleOver32_Inverted(CARD32*, CARD32*, int, int, int); #define stipple_get_scanline_func EXPNAME(XAAGetStippleScanlineFunc) #endif -StippleScanlineProcPtr stipple_scanline_func[6] = { +_X_EXPORT StippleScanlineProcPtr stipple_scanline_func[6] = { StipplePowerOfTwo, StippleUpTo32, StippleOver32, @@ -83,7 +83,7 @@ _X_EXPORT StippleScanlineProcPtr *stipple_get_scanline_func(void) { #if !defined(FIXEDBASE) && !defined(MSBFIRST) && !defined(TRIPLE_BITS) -unsigned int XAAShiftMasks[32] = { +_X_EXPORT unsigned int XAAShiftMasks[32] = { /* gcc is rather pedantic about SHIFT_R(0xFFFFFFFF,32) */ 0x00000000 , SHIFT_R(0xFFFFFFFF,31), SHIFT_R(0xFFFFFFFF,30), SHIFT_R(0xFFFFFFFF,29), @@ -105,7 +105,7 @@ unsigned int XAAShiftMasks[32] = { #endif -void +_X_EXPORT void #ifdef TRIPLE_BITS EXPNAME(XAAFillColorExpandRects3)( #else @@ -241,7 +241,7 @@ SECOND_PASS: -void +_X_EXPORT void #ifdef TRIPLE_BITS EXPNAME(XAAFillColorExpandSpans3)( #else @@ -352,7 +352,7 @@ SECOND_PASS: #ifndef FIXEDBASE -void +_X_EXPORT void #ifdef TRIPLE_BITS EXPNAME(XAAFillScanlineColorExpandRects3)( #else @@ -465,7 +465,7 @@ SECOND_PASS: SET_SYNC_FLAG(infoRec); } -void +_X_EXPORT void #ifdef TRIPLE_BITS EXPNAME(XAAFillScanlineColorExpandSpans3)( #else diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c index d1d12c7e3..86fb66c6f 100644 --- a/hw/xfree86/xaa/xaaTEGlyph.c +++ b/hw/xfree86/xaa/xaaTEGlyph.c @@ -78,7 +78,7 @@ static CARD32 *DrawTETextScanlineWidth9(CARD32 *base, unsigned int **glyphp, #define glyph_get_scanline_func EXPNAME(XAAGetGlyphScanlineFunc) -GlyphScanlineFuncPtr glyph_scanline_func[32] = { +_X_EXPORT GlyphScanlineFuncPtr glyph_scanline_func[32] = { DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, DrawTETextScanlineGeneric, @@ -143,7 +143,7 @@ _X_EXPORT GlyphScanlineFuncPtr *glyph_get_scanline_func(void) { /* This gets built for MSBFIRST or LSBFIRST with FIXEDBASE or not. A total of 4 versions */ -void +_X_EXPORT void EXPNAME(XAATEGlyphRenderer)( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -239,7 +239,7 @@ THE_END: ********************************************************************/ -void +_X_EXPORT void EXPNAME(XAATEGlyphRenderer3)( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -340,7 +340,7 @@ THE_END: #ifndef FIXEDBASE /* Scanline version of above gets built for LSBFIRST and MSBFIRST */ -void +_X_EXPORT void EXPNAME(XAATEGlyphRendererScanline)( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, @@ -415,7 +415,7 @@ THE_END: SET_SYNC_FLAG(infoRec); } -void +_X_EXPORT void EXPNAME(XAATEGlyphRendererScanline3)( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft, int startline, diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index fc445726f..7357862f7 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -50,7 +50,7 @@ static void XAAGlyphBltTEColorExpansion(ScrnInfoPtr pScrn, int xInit, ********************************************************************/ -int +_X_EXPORT int XAAPolyText8TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -74,7 +74,7 @@ XAAPolyText8TEColorExpansion( } -int +_X_EXPORT int XAAPolyText16TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -99,7 +99,7 @@ XAAPolyText16TEColorExpansion( } -void +_X_EXPORT void XAAImageText8TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -123,7 +123,7 @@ XAAImageText8TEColorExpansion( } -void +_X_EXPORT void XAAImageText16TEColorExpansion( DrawablePtr pDraw, GCPtr pGC, @@ -158,7 +158,7 @@ XAAImageText16TEColorExpansion( ********************************************************************/ -void +_X_EXPORT void XAAImageGlyphBltTEColorExpansion( DrawablePtr pDrawable, GCPtr pGC, @@ -178,7 +178,7 @@ XAAImageGlyphBltTEColorExpansion( pGC->pCompositeClip, nglyph, (unsigned char*)pglyphBase, ppci); } -void +_X_EXPORT void XAAPolyGlyphBltTEColorExpansion( DrawablePtr pDrawable, GCPtr pGC, diff --git a/hw/xfree86/xaa/xaaTables.c b/hw/xfree86/xaa/xaaTables.c index c7fa28af3..b6b7185fa 100644 --- a/hw/xfree86/xaa/xaaTables.c +++ b/hw/xfree86/xaa/xaaTables.c @@ -6,7 +6,7 @@ * bit order within a byte. */ -unsigned int byte_expand3[256] = +_X_EXPORT unsigned int byte_expand3[256] = { 0x000000, 0x000007, 0x000038, 0x00003F, 0x0001C0, 0x0001C7, 0x0001F8, 0x0001FF, 0x000E00, 0x000E07, 0x000E38, 0x000E3F, 0x000FC0, 0x000FC7, 0x000FF8, 0x000FFF, @@ -50,7 +50,7 @@ unsigned int byte_expand3[256] = * byte. */ -unsigned int byte_reversed_expand3[256] = +_X_EXPORT unsigned int byte_reversed_expand3[256] = { 0x000000, 0x0000E0, 0x00001C, 0x0000FC, 0x008003, 0x0080E3, 0x00801F, 0x0080FF, 0x007000, 0x0070E0, 0x00701C, 0x0070FC, 0x00F003, 0x00F0E3, 0x00F01F, 0x00F0FF, diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index a684d6676..aacc305a3 100644 --- a/hw/xfree86/xaa/xaaWideLine.c +++ b/hw/xfree86/xaa/xaaWideLine.c @@ -785,7 +785,7 @@ XAALineJoin ( } -void +_X_EXPORT void XAAPolylinesWideSolid ( DrawablePtr pDrawable, GCPtr pGC, |