diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-05 10:38:13 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-05 10:38:13 -0300 |
| commit | afaa57be301e00d5e6a797846234b4790fbb1576 (patch) | |
| tree | 3d220660eb7e8c53b5c49bea210653d43ec9be03 /platform | |
| parent | 010e3e0ac7edb93c83ac807438548d9b4b26605f (diff) | |
| parent | 8f4aef774d42af7354a93309b1f5149580f3b964 (diff) | |
| download | redot-engine-afaa57be301e00d5e6a797846234b4790fbb1576.tar.gz | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/windows/joystick.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/windows/joystick.h b/platform/windows/joystick.h index ad62059a73..332e86fbb8 100644 --- a/platform/windows/joystick.h +++ b/platform/windows/joystick.h @@ -44,6 +44,9 @@ if(x != NULL) \ } #endif +#ifndef XUSER_MAX_COUNT +#define XUSER_MAX_COUNT 4 +#endif class joystick_windows { |