Skip to content

Commit 573fe8a

Browse files
committed
Fix 3.10 patches again
1 parent 1f4ce1a commit 573fe8a

3 files changed

Lines changed: 11 additions & 5 deletions

patches/3.10/0001-Prevent-incorrect-include-of-io.h-found-in-libmpdec-.patch

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 046dc697f49f13443cd9c4f7ddc76ba277c799d4 Mon Sep 17 00:00:00 2001
1+
From 3c373cfd1c38b0ab69f5f268dc67cf45ae8933b1 Mon Sep 17 00:00:00 2001
22
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
33
Date: Mon, 6 Nov 2017 21:44:29 -0500
44
Subject: [PATCH 1/3] Prevent incorrect include of "io.h" found in libmpdec
@@ -8,8 +8,10 @@ This commit improves support for building python with built-in extensions
88
on windows where the header provided by libmpdec would be included instead
99
of the system one.
1010
---
11-
Modules/_decimal/libmpdec/io.c | 2 +-
12-
1 file changed, 1 insertion(+), 1 deletion(-)
11+
Modules/_decimal/libmpdec/io.c | 2 +-
12+
Modules/_decimal/libmpdec/{io.h => mpd_io.h} | 0
13+
2 files changed, 1 insertion(+), 1 deletion(-)
14+
rename Modules/_decimal/libmpdec/{io.h => mpd_io.h} (100%)
1315

1416
diff --git a/Modules/_decimal/libmpdec/io.c b/Modules/_decimal/libmpdec/io.c
1517
index e7bd6ae..ecebe82 100644
@@ -24,6 +26,10 @@ index e7bd6ae..ecebe82 100644
2426
#include "typearith.h"
2527

2628

29+
diff --git a/Modules/_decimal/libmpdec/io.h b/Modules/_decimal/libmpdec/mpd_io.h
30+
similarity index 100%
31+
rename from Modules/_decimal/libmpdec/io.h
32+
rename to Modules/_decimal/libmpdec/mpd_io.h
2733
--
2834
2.47.2
2935

patches/3.10/0002-Prevent-duplicated-OverlappedType-symbols-with-built.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From edf0fce3fd17e5823a8db463e2404993ee2a3de7 Mon Sep 17 00:00:00 2001
1+
From de2c387f6734745b5b5d0df0ee9291c2821174a9 Mon Sep 17 00:00:00 2001
22
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
33
Date: Mon, 6 Nov 2017 10:37:50 -0500
44
Subject: [PATCH 2/3] Prevent duplicated OverlappedType symbols with built-in

patches/3.10/0003-mpdecimal-Export-inlined-functions-to-support-extens.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From cb3cc08e5a1cf54d0d348d1597c828d85bdbef88 Mon Sep 17 00:00:00 2001
1+
From f5f464c478f754a8f25c7fa4ddf37e7b41540885 Mon Sep 17 00:00:00 2001
22
From: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
33
Date: Mon, 6 Nov 2017 11:27:32 -0500
44
Subject: [PATCH 3/3] mpdecimal: Export inlined functions to support extension

0 commit comments

Comments
 (0)