Merge branch 'master' into develop

# Conflicts: # src/gestures.c # src/makefile
2016-02-20 01:08:43 +01:00 · 2016-02-20 01:08:43 +01:00 · 954ced21a4
commit 954ced21a4
parent 98c60838fe f582ab06ad
1 changed files with 1 additions and 0 deletions
--- a/src/gestures.c
+++ b/src/gestures.c
@ -39,6 +39,7 @@
    int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount);
    int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency);
 #elif defined(__linux)
+    #include <sys/time.h>       // Declares storage size of ‘now’
    #include <time.h>           // Used for clock functions
 #endif