diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-20 07:07:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-20 07:07:37 +0000 |
| commit | 3319741e6f9fc3232eb40462a261271b9af2dcb2 (patch) | |
| tree | ffe7fbae59390aafa850dcdbd3ea48d2cb59bda0 /xorg-server/hw/xfree86/common/xf86.h | |
| parent | 153f5cafa19da4e4c0cf21e9c909958359ed8ebd (diff) | |
| download | vcxsrv-3319741e6f9fc3232eb40462a261271b9af2dcb2.tar.gz vcxsrv-3319741e6f9fc3232eb40462a261271b9af2dcb2.tar.bz2 vcxsrv-3319741e6f9fc3232eb40462a261271b9af2dcb2.zip | |
xserver git update 20/5/2010
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86.h')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h index cddca37a3..2a8b7e0a9 100644 --- a/xorg-server/hw/xfree86/common/xf86.h +++ b/xorg-server/hw/xfree86/common/xf86.h @@ -64,7 +64,7 @@ extern _X_EXPORT ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs * extern _X_EXPORT const unsigned char byte_reversed[256];
extern _X_EXPORT Bool pciSlotClaimed;
extern _X_EXPORT Bool fbSlotClaimed;
-#if defined(__sparc__) || defined(__sparc)
+#if (defined(__sparc__) || defined(__sparc)) && !defined(__OpenBSD__)
extern _X_EXPORT Bool sbusSlotClaimed;
#endif
extern _X_EXPORT confDRIRec xf86ConfigDRI;
@@ -104,7 +104,6 @@ extern _X_EXPORT void xf86FormatPciBusNumber(int busnum, char *buffer); extern _X_EXPORT int xf86GetFbInfoForScreen(int scrnIndex);
extern _X_EXPORT int xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
extern _X_EXPORT int xf86ClaimNoSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
-extern _X_EXPORT void xf86EnableAccess(ScrnInfoPtr pScrn);
extern _X_EXPORT Bool xf86IsPrimaryPci(struct pci_device * pPci);
/* new RAC */
extern _X_EXPORT Bool xf86DriverHasEntities(DriverPtr drvp);
|