deps: use nghttp2's config.h on all platforms

codebytere · codebytere · commit 23195779cc9c · 2022-08-25T10:19:33.000+02:00
nodejs/node#27283
diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch
@@ -709,10 +709,10 @@ index 0000000000000000000000000000000000000000..fb000f8ee7647c375bc190d1729d67bb
 +}
 diff --git a/deps/nghttp2/BUILD.gn b/deps/nghttp2/BUILD.gn
 new file mode 100644
-index 0000000000000000000000000000000000000000..8bfecba74d4d90e9fbf0e2cd301118e4adc6cba8
+index 0000000000000000000000000000000000000000..25589ebecd9648e9a9fbb126be98d5b315fa60b2
 --- /dev/null
 +++ b/deps/nghttp2/BUILD.gn
-@@ -0,0 +1,49 @@
+@@ -0,0 +1,53 @@
 +config("nghttp2_config") {
 +  defines = [ "NGHTTP2_STATICLIB" ]
 +  include_dirs = [ "lib/includes" ]
@@ -723,10 +723,14 @@ index 0000000000000000000000000000000000000000..8bfecba74d4d90e9fbf0e2cd301118e4
 +    "_U_",
 +    "BUILDING_NGHTTP2",
 +    "NGHTTP2_STATICLIB",
++    "HAVE_CONFIG_H",
 +  ]
 +  include_dirs = [ "lib/includes" ]
 +  if (is_win) {
-+    defines += [ "HAVE_CONFIG_H" ]
++    defines += [
++      "WIN32",
++      "_WINDOWS"
++    ]
 +  }
 +
 +  cflags_c = [
diff --git a/patches/node/chore_fix_-wimplicit-fallthrough.patch b/patches/node/chore_fix_-wimplicit-fallthrough.patch
@@ -6,10 +6,10 @@ Subject: chore: fix -Wimplicit-fallthrough
 Upstreamed at https://github.com/nghttp2/nghttp2/pull/1626.
 
 diff --git a/deps/nghttp2/BUILD.gn b/deps/nghttp2/BUILD.gn
-index 8bfecba74d4d90e9fbf0e2cd301118e4adc6cba8..63e1149f0c4a39cb944114e5824d6074343301e8 100644
+index 25589ebecd9648e9a9fbb126be98d5b315fa60b2..3760f6769e2dae2e5f0bba32609034e4453ff89a 100644
 --- a/deps/nghttp2/BUILD.gn
 +++ b/deps/nghttp2/BUILD.gn
-@@ -16,7 +16,6 @@ static_library("nghttp2") {
+@@ -20,7 +20,6 @@ static_library("nghttp2") {
  
    cflags_c = [
      "-Wno-implicit-function-declaration",
