Merge branch 'master' of github.com:mapbox/llmr-native

2014-04-16 15:41:33 -04:00
parent 70742c7a61 73b26f0a93
commit 7e3f374bd4
2 changed files with 3 additions and 3 deletions
--- a/common/glfw_view.hpp
+++ b/common/glfw_view.hpp
@@ -1,8 +1,8 @@
 #ifndef LLMR_COMMON_GLFW_VIEW
 #define LLMR_COMMON_GLFW_VIEW

-#include <GLFW/glfw3.h>
 #include <llmr/llmr.hpp>
+#include <GLFW/glfw3.h>

 class MapView {
 public:
--- a/include/llmr/platform/platform.hpp
+++ b/include/llmr/platform/platform.hpp
@@ -1,5 +1,5 @@
-#ifndef LLMR_PLATFORM_IOS
-#define LLMR_PLATFORM_IOS
+#ifndef LLMR_PLATFORM_PLATFORM
+#define LLMR_PLATFORM_PLATFORM

 #include <memory>
 #include <functional>