|
 |
6fbb4db |
From defecc867a0b5653554c41b06e78c0f24f6c10a8 Mon Sep 17 00:00:00 2001
|
|
|
6fbb4db |
From: David Allsopp <david.allsopp@metastack.com>
|
|
|
6fbb4db |
Date: Tue, 2 Aug 2022 17:21:08 +0100
|
|
|
6fbb4db |
Subject: [PATCH 17/24] Merge pull request #11468 from dra27/i686-mingw-ipv6
|
|
|
6fbb4db |
|
|
|
6fbb4db |
Fix detection of IPv6 on mingw-w64 i686
|
|
|
6fbb4db |
|
|
|
6fbb4db |
(cherry picked from commit 98392895940cc1c18534280ae001b70fa5bf24c2)
|
|
|
6fbb4db |
---
|
|
|
6fbb4db |
Changes | 4 ++++
|
|
|
6fbb4db |
configure | Bin 581563 -> 581611 bytes
|
|
|
6fbb4db |
configure.ac | 1 +
|
|
|
6fbb4db |
3 files changed, 5 insertions(+)
|
|
|
6fbb4db |
|
|
|
6fbb4db |
diff --git a/Changes b/Changes
|
|
|
6fbb4db |
index 99907b950a..6b537edca9 100644
|
|
|
6fbb4db |
--- a/Changes
|
|
|
6fbb4db |
+++ b/Changes
|
|
|
6fbb4db |
@@ -37,6 +37,10 @@ OCaml 4.14 maintenance branch
|
|
|
6fbb4db |
- #11417: Fix regression allowing virtual methods in non-virtual classes.
|
|
|
6fbb4db |
(Leo White, review by Florian Angeletti)
|
|
|
6fbb4db |
|
|
|
6fbb4db |
+- #11468: Fix regression from #10186 (OCaml 4.13) detecting IPv6 on Windows for
|
|
|
6fbb4db |
+ mingw-w64 i686 port.
|
|
|
6fbb4db |
+ (David Allsopp, review by Xavier Leroy and S├ębastien Hinderer)
|
|
|
6fbb4db |
+
|
|
|
6fbb4db |
OCaml 4.14.0 (28 March 2022)
|
|
|
6fbb4db |
----------------------------
|
|
|
6fbb4db |
|
|
|
6fbb4db |
diff --git a/configure b/configure
|
|
|
6fbb4db |
index c0dde03f183f86677b22a81238defdba60ad0080..536a1cbee58a430692bfa3de11901e7e2f6b4ee2 100755
|
|
|
6fbb4db |
GIT binary patch
|
|
|
6fbb4db |
delta 53
|
|
|
6fbb4db |
zcmdnJU-|WZ<%Sl<7N!>F7M2#)7Pc+y(YK}x+-47$p3}xEG`-+2o7nVsH`#OBfnwVQ
|
|
|
6fbb4db |
JZgZ?=0RTku6-595
|
|
|
6fbb4db |
|
|
|
6fbb4db |
delta 53
|
|
|
6fbb4db |
zcmV-50LuUCzazW9BY=bfgaU*Egam{Iga)(+TiTa!+Xo<*Y=#9AmvH?C7MJeX2fc@o
|
|
|
6fbb4db |
L+XuIh+X!0(RZ
|
|
|
6fbb4db |
|
|
|
6fbb4db |
diff --git a/configure.ac b/configure.ac
|
|
|
6fbb4db |
index 13d6d1a326..ebb8bbdb80 100644
|
|
|
6fbb4db |
--- a/configure.ac
|
|
|
6fbb4db |
+++ b/configure.ac
|
|
|
6fbb4db |
@@ -2016,6 +2016,7 @@ AS_CASE([$host],
|
|
|
6fbb4db |
[*-*-mingw32],
|
|
|
6fbb4db |
[AC_DEFINE([HAS_BROKEN_PRINTF])
|
|
|
6fbb4db |
AC_DEFINE([HAS_STRERROR])
|
|
|
6fbb4db |
+ AC_DEFINE([HAS_IPV6])
|
|
|
6fbb4db |
AC_DEFINE([HAS_NICE])],
|
|
|
6fbb4db |
[*-pc-windows],
|
|
|
6fbb4db |
[AC_DEFINE([HAS_BROKEN_PRINTF])
|
|
|
6fbb4db |
--
|
|
|
6fbb4db |
2.37.0.rc2
|
|
|
6fbb4db |
|