Manage latest release of Picotls

Author: huitema

picohttp/demoserver.c

@@ -22,6 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include <picotls.h>
 #include "picoquic_internal.h"
 #include "tls_api.h"

picohttp/h3zero_common.c

@@ -26,6 +26,11 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdio.h>
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include <picotls.h>
 #include "picosplay.h"
 #include "picoquic.h"

picohttp/h3zero_server.c

@@ -22,6 +22,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include <picotls.h>
 #include "picosplay.h"
 #include "picoquic_internal.h"

picoquic/logger.c

@@ -26,6 +26,11 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include <picotls.h>
 #include "picoquic_internal.h"
 #include "bytestream.h"

picoquic/picoquic_mbedtls.c

@@ -23,6 +23,12 @@
 * required variables and function pointers so they can be used by picoquic.
 */
 
+
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include "picotls.h"
 #ifndef PICOQUIC_WITH_MBEDTLS
 void picoquic_mbedtls_load(int unload)

picoquic/picoquic_ptls_fusion.c

@@ -23,7 +23,12 @@
  * required variables and function pointers so they can be used by picoquic.
  */
 
-#include "picotls.h"
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
+#include <picotls.h>
 #include "picoquic_crypto_provider_api.h"
 
 #ifdef _WINDOWS_TRY_AGAIN

picoquic/picoquic_ptls_minicrypto.c

@@ -22,7 +22,11 @@
 /* This module interfaces with the minicrypto libraries. It loads the
 * required variables and function pointers so they can be used by picoquic.
 */
-
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include "picotls.h"
 #include "picoquic_crypto_provider_api.h"
 #include "picotls/minicrypto.h"

picoquic/picoquic_ptls_openssl.c

@@ -23,8 +23,15 @@
  * required variables and function pointers so they can be used by picoquic.
  */
 
+
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include "picotls.h"
 #include "picoquic.h"
+
 #include "picoquic_crypto_provider_api.h"
 
 #ifdef PTLS_WITHOUT_OPENSSL

picoquic/tls_api.c

@@ -52,6 +52,11 @@
 
 #include <stddef.h>
 #include <stdlib.h>
+#ifdef _WINDOWS
+#include "wincompat.h"
+#include "ws2ipdef.h"
+#pragma warning(disable:4100)
+#endif
 #include "picotls.h"
 #include "picoquic_internal.h"
 #ifndef PTLS_WITHOUT_OPENSSL

picoquictest/cnxstress.c

@@ -22,17 +22,17 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <picotls.h>
-#include "picoquic_utils.h"
-#include "picoquic_internal.h"
-#include "tls_api.h"
-#include "picoquictest_internal.h"
 #ifdef _WINDOWS
 #include "wincompat.h"
+#include "ws2ipdef.h"
 #else
 #include <signal.h>
 #endif
-
+#include <picotls.h>
+#include "picoquic_utils.h"
+#include "picoquic_internal.h"
+#include "tls_api.h"
+#include "picoquictest_internal.h"
 #define CNX_STRESS_ALPN "cnxstress"
 
 typedef struct st_cnx_stress_stream_ctx_t {