diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-02 19:35:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-02 19:35:37 +0000 |
| commit | 8f2c5e2f41f211bed814be2889da16fc43e6f147 (patch) | |
| tree | e1f2715f63544d39302d6daa2cb0d4f53d295ebc /xorg-server/include | |
| parent | b404fe88bb87f42267cab4682b81f38cc442e617 (diff) | |
| parent | 314d225f3a60cc0ea63c292a2c2ffe3609e7c739 (diff) | |
| download | vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.tar.gz vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.tar.bz2 vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/kdrive-config.h.in | 3 | ||||
| -rw-r--r-- | xorg-server/include/ptrveloc.h | 3 | ||||
| -rw-r--r-- | xorg-server/include/site.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/xorg-server/include/kdrive-config.h.in b/xorg-server/include/kdrive-config.h.in index 3bc779218..14efb56b0 100644 --- a/xorg-server/include/kdrive-config.h.in +++ b/xorg-server/include/kdrive-config.h.in @@ -13,9 +13,6 @@ /* Include framebuffer support in X servers */ #undef KDRIVEFBDEV -/* Include vesa support in X servers */ -#undef KDRIVEVESA - /* Enable touchscreen support */ #undef TOUCHSCREEN diff --git a/xorg-server/include/ptrveloc.h b/xorg-server/include/ptrveloc.h index fa2156b0d..2a4b40b19 100644 --- a/xorg-server/include/ptrveloc.h +++ b/xorg-server/include/ptrveloc.h @@ -109,6 +109,9 @@ FreeVelocityData(DeviceVelocityPtr vel); extern _X_INTERNAL BOOL InitializePredictableAccelerationProperties(DeviceIntPtr dev); +extern _X_INTERNAL BOOL +DeletePredictableAccelerationProperties(DeviceIntPtr dev); + extern _X_EXPORT int SetAccelerationProfile(DeviceVelocityPtr vel, int profile_num); diff --git a/xorg-server/include/site.h b/xorg-server/include/site.h index b9ad5b3d0..4ec75edd3 100644 --- a/xorg-server/include/site.h +++ b/xorg-server/include/site.h @@ -73,7 +73,7 @@ SOFTWARE. * DO NOT CHANGE THESE VALUES OR THE DIX IMAKEFILE! */ #ifndef COMPILEDDEFAULTFONTPATH -#define COMPILEDDEFAULTFONTPATH "/usr/lib/X11/fonts/misc/" +#define COMPILEDDEFAULTFONTPATH "/usr/share/fonts/X11/misc/" #endif /* |