Make sure MAX_POINTERS is only defined once.

input/input_state.h

@@ -60,9 +60,7 @@ enum {
 	PAD_BUTTON_UNTHROTTLE = 1 << 20, // Click Tab to unthrottle
 };
 
-#ifndef MAX_POINTERS
 #define MAX_POINTERS 10
-#endif
 
 #ifndef MAX_KEYQUEUESIZE
 #define MAX_KEYQUEUESIZE 20

ui/ui.h

@@ -23,11 +23,12 @@
 #define GEN_ID_LOOP(i) ((__LINE__) + ((int)i) * 13612)
 #endif
 
-#include "gfx_es2/draw_buffer.h"
-
 #include <string>
 #include <vector>
 
+#include "gfx_es2/draw_buffer.h"
+#include "input/input_state.h"
+
 class Texture;
 class UIContext;
 
@@ -127,11 +128,6 @@ private:
 	float ySpacing_;
 };
 
-
-#ifndef MAX_POINTERS
-#define MAX_POINTERS 8
-#endif
-
 // "Mouse" out of habit, applies just as well to touch events.
 // TODO: Change to "pointer"
 // This struct is zeroed on init, so should be valid at that state.