diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-15 15:07:22 +0200 |
| commit | 9818207986d5db9831e43eb2a640be68f54bb2ef (patch) | |
| tree | e1ac6d17b2da887a2110c1337f01fc6fbdfa68fd /xorg-server/include | |
| parent | e6ff1fe09702cb307729b3208175c84f623f2968 (diff) | |
| parent | 062c45ff0df6a52080dcd74433710d47127cbe29 (diff) | |
| download | vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.gz vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.tar.bz2 vcxsrv-9818207986d5db9831e43eb2a640be68f54bb2ef.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/dixevents.h | 7 | ||||
| -rw-r--r-- | xorg-server/include/input.h | 3 | ||||
| -rw-r--r-- | xorg-server/include/resource.h | 3 |
3 files changed, 3 insertions, 10 deletions
diff --git a/xorg-server/include/dixevents.h b/xorg-server/include/dixevents.h index c8f384ea5..d4729697c 100644 --- a/xorg-server/include/dixevents.h +++ b/xorg-server/include/dixevents.h @@ -77,11 +77,4 @@ extern _X_EXPORT int ProcUngrabButton(ClientPtr /* client */ ); extern _X_EXPORT int ProcRecolorCursor(ClientPtr /* client */ ); -#ifdef PANORAMIX -extern _X_EXPORT void PostSyntheticMotion(DeviceIntPtr pDev, - int x, - int y, - int screen, unsigned long time); -#endif - #endif /* DIXEVENTS_H */ diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index 991d64813..bcf98a63e 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -472,6 +472,9 @@ extern _X_EXPORT int GetProximityEvents(InternalEvent *events, extern _X_EXPORT void QueueProximityEvents(DeviceIntPtr pDev, int type, const ValuatorMask *mask); +#ifdef PANORAMIX +_X_EXPORT +#endif extern void PostSyntheticMotion(DeviceIntPtr pDev, int x, int y, int screen, unsigned long time); diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h index 02db6d80a..3719242bf 100644 --- a/xorg-server/include/resource.h +++ b/xorg-server/include/resource.h @@ -180,9 +180,6 @@ typedef void (*FindTypeSubResources)(pointer /* value */, FindAllRes /* func */, pointer /* cdata */); -extern _X_EXPORT void SetResourceTypeErrorValue(RESTYPE /*type */ , - int /*errorValue */ ); - extern _X_EXPORT SizeType GetResourceTypeSizeFunc( RESTYPE /*type*/); |