From 4e997a2e15d5e930601ada2d931d67eb36e0f95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 4 Nov 2013 15:31:33 +0100
Subject: [PATCH] Make sure MAX_POINTERS is only defined once.

---
 input/input_state.h |  2 --
 ui/ui.h             | 10 +++-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/input/input_state.h b/input/input_state.h
index 8a86e6d575..561ea60096 100644
--- a/input/input_state.h
+++ b/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
diff --git a/ui/ui.h b/ui/ui.h
index 9c8770ffd1..f00dd5f58b 100644
--- a/ui/ui.h
+++ b/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.