diff --git a/include/mbgl/platform/default/headless_display.hpp b/include/mbgl/platform/default/headless_display.hpp index 079947e77..08c423c58 100644 --- a/include/mbgl/platform/default/headless_display.hpp +++ b/include/mbgl/platform/default/headless_display.hpp @@ -1,7 +1,7 @@ #ifndef MBGL_COMMON_HEADLESS_DISPLAY #define MBGL_COMMON_HEADLESS_DISPLAY -#include +#include namespace mbgl { diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa index a44ac9c3d..7e16edebf 160000 --- a/ios/mapbox-gl-cocoa +++ b/ios/mapbox-gl-cocoa @@ -1 +1 @@ -Subproject commit a44ac9c3dddc564cb3bddc8b3a89d45e13ff2a0e +Subproject commit 7e16edebf067c4195c98cb050f08ef85c690078f diff --git a/src/mbgl/util/vec.hpp b/src/mbgl/util/vec.hpp deleted file mode 100644 index 60065b4fc..000000000 --- a/src/mbgl/util/vec.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef MBGL_UTIL_VEC -#define MBGL_UTIL_VEC - -#include - -namespace mbgl { - -struct box { - vec2 tl, tr, bl, br; - vec2 center; -}; - -} - -#endif