Fix #include <uv.h> mixing between C and C++ modes

This commit is contained in:
Leith Bade
2015-02-11 19:01:30 -08:00
parent 4ca21db5df
commit acfeda9899
3 changed files with 8 additions and 8 deletions

View File

@@ -1,12 +1,12 @@
#ifndef MBGL_UTIL_UV_MESSENGER
#define MBGL_UTIL_UV_MESSENGER
#include <uv.h>
#ifdef __cplusplus
extern "C" {
#endif
#include <uv.h>
typedef struct uv_messenger_s uv_messenger_t;
typedef void (*uv_messenger_cb)(void *arg);
typedef void (*uv_messenger_stop_cb)(uv_messenger_t *msgr);

View File

@@ -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;

View File

@@ -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;