twix/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2026-01-31 03:09:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	src/gestures.c
#	src/makefile
This commit is contained in:
Ray
2016-02-20 01:08:43 +01:00
parent 98c60838fe f582ab06ad
commit 954ced21a4
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gestures.c
View File

@ -39,6 +39,7 @@
int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount); int __stdcall QueryPerformanceCounter(unsigned long long int *lpPerformanceCount);
int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency); int __stdcall QueryPerformanceFrequency(unsigned long long int *lpFrequency);
#elif defined(__linux) #elif defined(__linux)
#include <sys/time.h> // Declares storage size of ‘now’
#include <time.h> // Used for clock functions #include <time.h> // Used for clock functions
#endif #endif