1 files changed, 16 insertions, 1 deletions
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index 2361810a0..7f273fb2d 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -65,6 +65,21 @@
 #include "extnsionst.h"
 #include "listdev.h" /* for sizing up DeviceClassesChangedEvent */
 
+#ifdef _MSC_VER
+#include <math.h>
+
+float roundf(float f)
+{
+  return ((f<0.0f) ? ceil(f-.5)  : floor (f+.5));
+}
+double roundd(double f)
+{
+  return ((f<0.0) ? ceil(f-.5)  : floor (f+.5));
+}
+#define lroundf(val)   ((int)roundf(val))
+#define lround(val)   ((int)roundd(val))
+#endif
+
 /* Number of motion history events to store. */
 #define MOTION_HISTORY_SIZE 256
 
@@ -952,7 +967,7 @@ GetKeyboardValuatorEvents(EventList *events, DeviceIntPtr pDev, int type,
     ValuatorMask mask;
 
     /* refuse events from disabled devices */
-    if (!pDev->enabled)
+    if (!pDev || !pDev->enabled)
         return 0;
 
     if (!events ||!pDev->key || !pDev->focus || !pDev->kbdfeed ||