diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2015-02-04 11:05:36 -0800 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2015-02-04 11:05:36 -0800 |
| commit | 465b1ac3eb45cbb946476ca73f421f02da225175 (patch) | |
| tree | e7d29cf8f969250c1e94479b8778e52e10e0af9e /src/mbgl/util/uv-worker.h | |
| parent | c9f8de863dc93e4fd587290357c8a3b572a4f956 (diff) | |
| parent | 002a709b67ac1ac36d4711a913a3fc082494ff71 (diff) | |
| download | qtlocation-mapboxgl-465b1ac3eb45cbb946476ca73f421f02da225175.tar.gz | |
Merge branch 'master' into pattern-functions
Conflicts:
src/mbgl/renderer/painter.cpp
src/mbgl/renderer/painter.hpp
src/mbgl/renderer/painter_fill.cpp
src/mbgl/renderer/painter_line.cpp
src/mbgl/style/style_layer.cpp
src/mbgl/style/style_layer.hpp
src/mbgl/style/style_layer_group.cpp
src/mbgl/style/style_layer_group.hpp
Diffstat (limited to 'src/mbgl/util/uv-worker.h')
| -rw-r--r-- | src/mbgl/util/uv-worker.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/util/uv-worker.h b/src/mbgl/util/uv-worker.h index cb2075d1c3..5640bfd14d 100644 --- a/src/mbgl/util/uv-worker.h +++ b/src/mbgl/util/uv-worker.h @@ -17,7 +17,7 @@ typedef void (*uv_worker_after_cb)(void *data); typedef void (*uv_worker_close_cb)(uv_worker_t *worker); struct uv_worker_s { -#ifndef NDEBUG +#ifdef DEBUG unsigned long thread_id; #endif uv_loop_t *loop; |