diff options
| author | gengjiawen <technicalcute@gmail.com> | 2019-03-30 00:22:54 +0800 |
|---|---|---|
| committer | ZYSzys <zyszys98@gmail.com> | 2019-04-03 22:18:17 +0800 |
| commit | 5c2ee4ee8dd8045b3598db219d220988b4c4199e (patch) | |
| tree | b88c4ea99114be08de08f393ccc27a13eb52ed4d /deps/nghttp2/lib/includes | |
| parent | 198d7a47c25d2f34440a8bdd40fbf3cc3f80f8ad (diff) | |
| download | android-node-v8-5c2ee4ee8dd8045b3598db219d220988b4c4199e.tar.gz android-node-v8-5c2ee4ee8dd8045b3598db219d220988b4c4199e.tar.bz2 android-node-v8-5c2ee4ee8dd8045b3598db219d220988b4c4199e.zip | |
deps: update nghttp2 to 1.37.0
PR-URL: https://github.com/nodejs/node/pull/26990
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'deps/nghttp2/lib/includes')
| -rw-r--r-- | deps/nghttp2/lib/includes/nghttp2/nghttp2.h | 8 | ||||
| -rw-r--r-- | deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h index e7198b3d27..925a4cbcaf 100644 --- a/deps/nghttp2/lib/includes/nghttp2/nghttp2.h +++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2.h @@ -31,6 +31,11 @@ # define WIN32 #endif +/* Compatibility for non-Clang compilers */ +#ifndef __has_declspec_attribute +# define __has_declspec_attribute(x) 0 +#endif + #ifdef __cplusplus extern "C" { #endif @@ -51,7 +56,8 @@ extern "C" { #ifdef NGHTTP2_STATICLIB # define NGHTTP2_EXTERN -#elif defined(WIN32) +#elif defined(WIN32) || (__has_declspec_attribute(dllexport) && \ + __has_declspec_attribute(dllimport)) # ifdef BUILDING_NGHTTP2 # define NGHTTP2_EXTERN __declspec(dllexport) # else /* !BUILDING_NGHTTP2 */ diff --git a/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h b/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h index 420adbd53d..2384f52787 100644 --- a/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h +++ b/deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h @@ -29,7 +29,7 @@ * @macro * Version number of the nghttp2 library release */ -#define NGHTTP2_VERSION "1.34.0" +#define NGHTTP2_VERSION "1.37.0" /** * @macro @@ -37,6 +37,6 @@ * release. This is a 24 bit number with 8 bits for major number, 8 bits * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. */ -#define NGHTTP2_VERSION_NUM 0x012200 +#define NGHTTP2_VERSION_NUM 0x012500 #endif /* NGHTTP2VER_H */ |