Merge pull request #508 from huitema/master

Fix use of bitfield unsupported by Windows compilers
h2o · Jan 11, 2024 · eb013f7 · eb013f7
2 parents 610286e + a303265
commit eb013f7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/include/picotls.h b/include/picotls.h
@@ -986,7 +986,7 @@ struct st_ptls_context_t {
      */
     struct {
         uint8_t bytes[PTLS_SHA256_DIGEST_SIZE];
-        uint8_t is_set : 1;
+        unsigned is_set : 1;
     } ticket_context;
     /**
      * (optional) list of CAs advertised to clients as supported in the CertificateRequest message; each item must be DNs in DER

diff --git a/t/mbedtls.c b/t/mbedtls.c
@@ -89,7 +89,6 @@ static void test_key_exchanges(void)
     subtest("x25519", test_x25519);
 }
 
-<
 DEFINE_FFX_AES128_ALGORITHMS(mbedtls);
 DEFINE_FFX_CHACHA20_ALGORITHMS(mbedtls);
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,6 @@ static void test_key_exchanges(void) @@
         subtest("x25519", test_x25519);
     }
-    <
     DEFINE_FFX_AES128_ALGORITHMS(mbedtls);
     DEFINE_FFX_CHACHA20_ALGORITHMS(mbedtls);
@@ Expand Down @@