Merge branch 'clang' of https://github.com/alagoutte/nghttp2 into alagoutte-clang

This commit is contained in:
Tatsuhiro Tsujikawa 2014-05-01 10:45:38 +09:00
commit 813c750c12
2 changed files with 2 additions and 2 deletions

View File

@ -352,7 +352,7 @@ static SSL* create_ssl(SSL_CTX *ssl_ctx)
static void initialize_nghttp2_session(http2_session_data *session_data) static void initialize_nghttp2_session(http2_session_data *session_data)
{ {
nghttp2_session_callbacks callbacks = {0}; nghttp2_session_callbacks callbacks;
callbacks.send_callback = send_callback; callbacks.send_callback = send_callback;
callbacks.before_frame_send_callback = before_frame_send_callback; callbacks.before_frame_send_callback = before_frame_send_callback;

View File

@ -549,7 +549,7 @@ static int on_stream_close_callback(nghttp2_session *session,
static void initialize_nghttp2_session(http2_session_data *session_data) static void initialize_nghttp2_session(http2_session_data *session_data)
{ {
nghttp2_session_callbacks callbacks = {0}; nghttp2_session_callbacks callbacks;
callbacks.send_callback = send_callback; callbacks.send_callback = send_callback;
callbacks.on_frame_recv_callback = on_frame_recv_callback; callbacks.on_frame_recv_callback = on_frame_recv_callback;