diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-06-17 13:59:54 -0400 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-06-19 11:48:41 -0700 |
| commit | 898f4d3f084fc9553b92956da04019af90a4f872 (patch) | |
| tree | 0bc0ed9c3bd792ddaeb78cf76bf427fd5f53b49b /src | |
| parent | 0f5ad29b4e88ef3c736959a58a5b37c1fa3cc3a6 (diff) | |
| download | qtlocation-mapboxgl-898f4d3f084fc9553b92956da04019af90a4f872.tar.gz | |
Check libuv version semver-ishly
Fixes https://github.com/mapbox/node-mapbox-gl-native/issues/137
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/util/uv.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/util/uv.cpp b/src/mbgl/util/uv.cpp index d76e42f67d..e36d07cc94 100644 --- a/src/mbgl/util/uv.cpp +++ b/src/mbgl/util/uv.cpp @@ -16,7 +16,7 @@ const static bool uvVersionCheck = []() { const unsigned int UV_VERSION_PATCH = version & 0xFF; #endif - if (major != UV_VERSION_MAJOR || minor != UV_VERSION_MINOR || patch != UV_VERSION_PATCH) { + if (major != UV_VERSION_MAJOR || (major == 0 && minor != UV_VERSION_MINOR)) { throw std::runtime_error(mbgl::util::sprintf<96>( "libuv version mismatch: headers report %d.%d.%d, but library reports %d.%d.%d", UV_VERSION_MAJOR, UV_VERSION_MINOR, UV_VERSION_PATCH, major, minor, patch)); |