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: #27283 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
nodejs · Apr 22, 2019 · 90cf2d5 · 90cf2d5
1 parent 72308a5
commit 90cf2d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -12,13 +12,13 @@
       'defines': [
         'BUILDING_NGHTTP2',
         'NGHTTP2_STATICLIB',
+        'HAVE_CONFIG_H',
       ],
       'conditions': [
         ['OS=="win"', {
           'defines': [
             'WIN32',
             '_WINDOWS',
-            'HAVE_CONFIG_H',
           ],
           'msvs_settings': {
             'VCCLCompilerTool': {