Repository: mesos Updated Branches: refs/heads/master 1ff83d71a -> f4ae816b6
Added missing #ifdefs for http parser in decoder.hpp. Review: https://reviews.apache.org/r/20441 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f4ae816b Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f4ae816b Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f4ae816b Branch: refs/heads/master Commit: f4ae816b62ee5d9ea48c966d9d5d8f7af837fdeb Parents: 1ff83d7 Author: Chengwei Yang <[email protected]> Authored: Thu Apr 17 14:48:42 2014 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Thu Apr 17 14:48:42 2014 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/src/decoder.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/f4ae816b/3rdparty/libprocess/src/decoder.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/decoder.hpp b/3rdparty/libprocess/src/decoder.hpp index 88da57f..44f7cd4 100644 --- a/3rdparty/libprocess/src/decoder.hpp +++ b/3rdparty/libprocess/src/decoder.hpp @@ -396,12 +396,13 @@ private: return 0; } - static int on_path(http_parser* p, const char* data, size_t length) + static int on_url(http_parser* p, const char* data, size_t length) { return 0; } - static int on_url(http_parser* p, const char* data, size_t length) +#if !(HTTP_PARSER_VERSION_MAJOR >= 2) + static int on_path(http_parser* p, const char* data, size_t length) { return 0; } @@ -415,6 +416,7 @@ private: { return 0; } +#endif // !(HTTP_PARSER_VERSION_MAJOR >= 2) static int on_body(http_parser* p, const char* data, size_t length) {
