summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-11-18 17:26:01 -0800
committerThiago Marcos P. Santos <thiago@mapbox.com>2015-12-01 11:49:02 +0200
commitf2553fff8926e78fdc00119efec48933f542ada1 (patch)
tree73af9d64f4ae35a0a1ef9f6355d659c51b50110d /src
parentcb06526b10d9ef44b3606c36aec498822884251e (diff)
downloadqtlocation-mapboxgl-f2553fff8926e78fdc00119efec48933f542ada1.tar.gz
[core] Merge uv_detail.hpp into uv.hpp
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/util/thread_context.hpp2
-rw-r--r--src/mbgl/util/uv.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/mbgl/util/thread_context.hpp b/src/mbgl/util/thread_context.hpp
index 626925bdcd..5a91affda8 100644
--- a/src/mbgl/util/thread_context.hpp
+++ b/src/mbgl/util/thread_context.hpp
@@ -1,7 +1,7 @@
#ifndef MBGL_UTIL_THREAD_CONTEXT
#define MBGL_UTIL_THREAD_CONTEXT
-#include <mbgl/util/uv_detail.hpp>
+#include <mbgl/util/uv.hpp>
#include <cstdint>
#include <string>
diff --git a/src/mbgl/util/uv.cpp b/src/mbgl/util/uv.cpp
index c8181e0e36..4f56b419e7 100644
--- a/src/mbgl/util/uv.cpp
+++ b/src/mbgl/util/uv.cpp
@@ -1,5 +1,4 @@
#include <mbgl/util/uv.hpp>
-#include <mbgl/util/uv_detail.hpp>
#include <mbgl/util/string.hpp>
#include <uv.h>