diff options
| -rw-r--r-- | xorg-server/dix/getevents.c | 13 | ||||
| -rw-r--r-- | xorg-server/dix/ptrveloc.c | 1 | ||||
| -rw-r--r-- | xorg-server/dix/window.c | 5 |
3 files changed, 6 insertions, 13 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c index e19d0ce11..1ff868190 100644 --- a/xorg-server/dix/getevents.c +++ b/xorg-server/dix/getevents.c @@ -63,7 +63,11 @@ #include "listdev.h" /* for sizing up DeviceClassesChangedEvent */ #ifdef _MSC_VER -#define lroundf(val) ((int)(val<0.0f)?val-.5f:val+.5f) +float roundf(float f) +{ + return ((f<0.0f) ? ceil(f-.5) : floor (f+.5)); +} +#define lroundf(val) ((int)roundf(val)) #endif /* Number of motion history events to store. */ @@ -130,13 +134,6 @@ key_autorepeats(DeviceIntPtr pDev, int key_code) (1 << (key_code & 7))); } -#ifdef _MSC_VER -float roundf(float f) -{ - return ((f<0.0f) ? ceil(f-.5) : floor (f+.5)); -} -#endif - static void init_event(DeviceIntPtr dev, DeviceEvent* event, Time ms) { diff --git a/xorg-server/dix/ptrveloc.c b/xorg-server/dix/ptrveloc.c index 684f2a851..55cdb46c4 100644 --- a/xorg-server/dix/ptrveloc.c +++ b/xorg-server/dix/ptrveloc.c @@ -37,7 +37,6 @@ #include <xserver-properties.h> - /***************************************************************************** * Predictable pointer acceleration * diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c index e9d90aba4..caff1cbff 100644 --- a/xorg-server/dix/window.c +++ b/xorg-server/dix/window.c @@ -3042,12 +3042,9 @@ NotClippedByChildren(WindowPtr pWin) void SendVisibilityNotify(WindowPtr pWin) { -#ifndef NO_XINERAMA_PORT - unsigned int visibility; -#endif xEvent event; #ifndef NO_XINERAMA_PORT - visibility = pWin->visibility; + unsigned int visibility = pWin->visibility; #endif if (!MapUnmapEventsEnabled(pWin)) return; |