diff options
| author | Leith Bade <leith@mapbox.com> | 2015-02-11 19:01:30 -0800 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2015-02-11 19:01:30 -0800 |
| commit | acfeda98990d792280c321a7718ad8010428eddf (patch) | |
| tree | 7035a1f099f4b56098b66976a58de7e81462eb1d /src | |
| parent | 4ca21db5dfec46f9052c39eb9b5228bd7a323f41 (diff) | |
| download | qtlocation-mapboxgl-acfeda98990d792280c321a7718ad8010428eddf.tar.gz | |
Fix #include <uv.h> mixing between C and C++ modes
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/util/uv-channel.h | 4 | ||||
| -rw-r--r-- | src/mbgl/util/uv-worker.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/util/uv-channel.h b/src/mbgl/util/uv-channel.h index ea5c279f65..0a0d706477 100644 --- a/src/mbgl/util/uv-channel.h +++ b/src/mbgl/util/uv-channel.h @@ -1,12 +1,12 @@ #ifndef MBGL_UTIL_UV_CHANNEL #define MBGL_UTIL_UV_CHANNEL +#include <uv.h> + #ifdef __cplusplus extern "C" { #endif -#include <uv.h> - // Taken from http://navaneeth.github.io/blog/2013/08/02/channels-in-libuv/ typedef struct uv_chan_s uv_chan_t; diff --git a/src/mbgl/util/uv-worker.h b/src/mbgl/util/uv-worker.h index 5640bfd14d..65ad42edb8 100644 --- a/src/mbgl/util/uv-worker.h +++ b/src/mbgl/util/uv-worker.h @@ -1,14 +1,14 @@ #ifndef MBGL_UTIL_UV_WORKER #define MBGL_UTIL_UV_WORKER -#ifdef __cplusplus -extern "C" { -#endif +#include <stdlib.h> #include <mbgl/util/uv-messenger.h> #include <mbgl/util/uv-channel.h> -#include <stdlib.h> +#ifdef __cplusplus +extern "C" { +#endif typedef struct uv_worker_s uv_worker_t; |