nghttp2/nghttp2
1
0
Fork 0
mirror of https://github.com/nghttp2/nghttp2.git synced 2025-12-10 03:58:53 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into v1.0.0

Browse Source 
Conflicts:
	src/HttpServer.cc
This commit is contained in:
Tatsuhiro Tsujikawa
2015-05-15 23:24:19 +09:00
parent 64b1aae567 92a20c76e6
commit 0b27f005e0
75 changed files with 504 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/includes/nghttp2/nghttp2.h
View File

@@ -36,7 +36,7 @@ extern "C" {
#endif
#include <stdlib.h>
#include <stdint.h>
#include <inttypes.h>
#include <sys/types.h>
#include <nghttp2/nghttp2ver.h>