Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: ecd5d0a3a4
Branches Tags
electron
/
patches
/
node
/
fix_-wextra-semi_errors_in_nghttp2_helper_h.patch

fix_-wextra-semi_errors_in_nghttp2_helper_h.patch 2.2 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Wed, 16 Oct 2024 16:09:37 +0200
    4. 

  4. Subject: fix: -Wextra-semi errors in nghttp2_helper.h
    5. 

  5. 

  6. Introduced in https://github.com/nodejs/node/pull/52966
    7. 

  7. 

  8. Upstreamed in https://github.com/nghttp2/nghttp2/pull/2258
    9. 

  9. 

  10. diff --git a/deps/nghttp2/lib/nghttp2_helper.h b/deps/nghttp2/lib/nghttp2_helper.h
    11. 

  11. index 89b0d4f535db795cd1df582475c02b2f4d1ac98f..f5de6290dab0e17ae3aff10230dd8ad7414f9631 100644
    12. 

  12. --- a/deps/nghttp2/lib/nghttp2_helper.h
    13. 

  13. +++ b/deps/nghttp2/lib/nghttp2_helper.h
    14. 

  14. @@ -38,28 +38,28 @@
    15. 

  15.  #define nghttp2_max_def(SUFFIX, T)                                             \
    16. 

  16.    static inline T nghttp2_max_##SUFFIX(T a, T b) { return a < b ? b : a; }
    17. 

  17.  
    18. 

  18. -nghttp2_max_def(int8, int8_t);
    19. 

  19. -nghttp2_max_def(int16, int16_t);
    20. 

  20. -nghttp2_max_def(int32, int32_t);
    21. 

  21. -nghttp2_max_def(int64, int64_t);
    22. 

  22. -nghttp2_max_def(uint8, uint8_t);
    23. 

  23. -nghttp2_max_def(uint16, uint16_t);
    24. 

  24. -nghttp2_max_def(uint32, uint32_t);
    25. 

  25. -nghttp2_max_def(uint64, uint64_t);
    26. 

  26. -nghttp2_max_def(size, size_t);
    27. 

  27. +nghttp2_max_def(int8, int8_t)
    28. 

  28. +nghttp2_max_def(int16, int16_t)
    29. 

  29. +nghttp2_max_def(int32, int32_t)
    30. 

  30. +nghttp2_max_def(int64, int64_t)
    31. 

  31. +nghttp2_max_def(uint8, uint8_t)
    32. 

  32. +nghttp2_max_def(uint16, uint16_t)
    33. 

  33. +nghttp2_max_def(uint32, uint32_t)
    34. 

  34. +nghttp2_max_def(uint64, uint64_t)
    35. 

  35. +nghttp2_max_def(size, size_t)
    36. 

  36.  
    37. 

  37.  #define nghttp2_min_def(SUFFIX, T)                                             \
    38. 

  38.    static inline T nghttp2_min_##SUFFIX(T a, T b) { return a < b ? a : b; }
    39. 

  39.  
    40. 

  40. -nghttp2_min_def(int8, int8_t);
    41. 

  41. -nghttp2_min_def(int16, int16_t);
    42. 

  42. -nghttp2_min_def(int32, int32_t);
    43. 

  43. -nghttp2_min_def(int64, int64_t);
    44. 

  44. -nghttp2_min_def(uint8, uint8_t);
    45. 

  45. -nghttp2_min_def(uint16, uint16_t);
    46. 

  46. -nghttp2_min_def(uint32, uint32_t);
    47. 

  47. -nghttp2_min_def(uint64, uint64_t);
    48. 

  48. -nghttp2_min_def(size, size_t);
    49. 

  49. +nghttp2_min_def(int8, int8_t)
    50. 

  50. +nghttp2_min_def(int16, int16_t)
    51. 

  51. +nghttp2_min_def(int32, int32_t)
    52. 

  52. +nghttp2_min_def(int64, int64_t)
    53. 

  53. +nghttp2_min_def(uint8, uint8_t)
    54. 

  54. +nghttp2_min_def(uint16, uint16_t)
    55. 

  55. +nghttp2_min_def(uint32, uint32_t)
    56. 

  56. +nghttp2_min_def(uint64, uint64_t)
    57. 

  57. +nghttp2_min_def(size, size_t)
    58. 

  58.  
    59. 

  59.  #define lstreq(A, B, N) ((sizeof((A)) - 1) == (N) && memcmp((A), (B), (N)) == 0)
    60. 

  60.  
    61.