diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2019-04-17 10:42:15 -0700 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2019-04-22 12:08:17 -0700 |
| commit | 90cf2d5f008b59ee0cbe881b1835eaf6a6a77fe2 (patch) | |
| tree | 7890e2633065c6d607151f67cf0729f2b37ff051 /deps/nghttp2 | |
| parent | 72308a5deb6e0fdb1e9c9e972d16cfe323b39661 (diff) | |
| download | android-node-v8-90cf2d5f008b59ee0cbe881b1835eaf6a6a77fe2.tar.gz android-node-v8-90cf2d5f008b59ee0cbe881b1835eaf6a6a77fe2.tar.bz2 android-node-v8-90cf2d5f008b59ee0cbe881b1835eaf6a6a77fe2.zip | |
deps: use nghttp2's config.h on all platforms
Fix warnings about use of htonl(), etc. by including config.h for all
platforms, defining HAVE_ARPA_INET_H on non-Windows, and therefore
including <arpa/inet.h>, which defines the host to network byte order
conversion functions.
PR-URL: https://github.com/nodejs/node/pull/27283
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'deps/nghttp2')
| -rw-r--r-- | deps/nghttp2/lib/includes/config.h | 4 | ||||
| -rw-r--r-- | deps/nghttp2/nghttp2.gyp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/deps/nghttp2/lib/includes/config.h b/deps/nghttp2/lib/includes/config.h index 242bbcfb62..12a816e4dd 100644 --- a/deps/nghttp2/lib/includes/config.h +++ b/deps/nghttp2/lib/includes/config.h @@ -54,7 +54,9 @@ typedef intptr_t ssize_t; /* #undef NOTHREADS */ /* Define to 1 if you have the <arpa/inet.h> header file. */ -/* #undef HAVE_ARPA_INET_H */ +#ifndef _WIN32 +# define HAVE_ARPA_INET_H 1 +#endif /* Define to 1 if you have the <fcntl.h> header file. */ #define HAVE_FCNTL_H 1 diff --git a/deps/nghttp2/nghttp2.gyp b/deps/nghttp2/nghttp2.gyp index 8da81485e5..0dcd034b81 100644 --- a/deps/nghttp2/nghttp2.gyp +++ b/deps/nghttp2/nghttp2.gyp @@ -12,13 +12,13 @@ 'defines': [ 'BUILDING_NGHTTP2', 'NGHTTP2_STATICLIB', + 'HAVE_CONFIG_H', ], 'conditions': [ ['OS=="win"', { 'defines': [ 'WIN32', '_WINDOWS', - 'HAVE_CONFIG_H', ], 'msvs_settings': { 'VCCLCompilerTool': { |