aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/os-support/shared/vidmem.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-09 05:23:48 +0000
committermarha <marha@users.sourceforge.net>2009-09-09 05:23:48 +0000
commit81f91c615982e50bb62708201569c33a3cd3d973 (patch)
tree4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/hw/xfree86/os-support/shared/vidmem.c
parentb571a562410f565af2bdde52d9f7f9a23ffae04f (diff)
parenta915739887477b28d924ecc8417ee107d125bd6c (diff)
downloadvcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz
vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2
vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/shared/vidmem.c')
-rw-r--r--xorg-server/hw/xfree86/os-support/shared/vidmem.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/xorg-server/hw/xfree86/os-support/shared/vidmem.c b/xorg-server/hw/xfree86/os-support/shared/vidmem.c
index 0b4411604..803ce09bd 100644
--- a/xorg-server/hw/xfree86/os-support/shared/vidmem.c
+++ b/xorg-server/hw/xfree86/os-support/shared/vidmem.c
@@ -184,7 +184,7 @@ xf86InitVidMem(void)
}
}
-_X_EXPORT pointer
+pointer
xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
{
pointer vbase = NULL;
@@ -230,7 +230,7 @@ xf86MapVidMem(int ScreenNum, int Flags, unsigned long Base, unsigned long Size)
return vbase;
}
-_X_EXPORT void
+void
xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
{
VidMapPtr vp;
@@ -257,7 +257,7 @@ xf86UnMapVidMem(int ScreenNum, pointer Base, unsigned long Size)
removeMapping(vp, mp);
}
-_X_EXPORT Bool
+Bool
xf86CheckMTRR(int ScreenNum)
{
VidMapPtr vp = getVidMapRec(ScreenNum);
@@ -274,14 +274,14 @@ xf86CheckMTRR(int ScreenNum)
return FALSE;
}
-_X_EXPORT Bool
-xf86LinearVidMem()
+Bool
+xf86LinearVidMem(void)
{
xf86InitVidMem();
return vidMemInfo.linearSupported;
}
-_X_EXPORT void
+void
xf86MapReadSideEffects(int ScreenNum, int Flags, pointer base,
unsigned long Size)
{