From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 28 Feb 2014 22:26:43 +0000 (+0100)
Subject: http2: build with current nghttp2 version
X-Git-Tag: upstream/7.37.1~489
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53f1f4a18ee7e3ac5fbe44a0e16b33b27465432b;p=platform%2Fupstream%2Fcurl.git

http2: build with current nghttp2 version

nghttp2 has yet again extended its callback struct and this is an
attempt to make curl compile with nghttp2 from current git
---

diff --git a/lib/http2.c b/lib/http2.c
index e8d31d5..d364f3a 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -376,6 +376,9 @@ static const nghttp2_session_callbacks callbacks = {
   on_unknown_frame_recv, /* nghttp2_on_unknown_frame_recv_callback */
   on_begin_headers,      /* nghttp2_on_begin_headers_callback */
   on_header              /* nghttp2_on_header_callback */
+#if NGHTTP2_VERSION_NUM >= 0x000400
+  , NULL                 /* nghttp2_select_padding_callback */
+#endif
 };
 
 static ssize_t data_source_read_callback(nghttp2_session *session,