From 930e7034d92c8589d233211af6d4aabb45427304 Mon Sep 17 00:00:00 2001
From: Stefan Krah <skrah@bytereef.org>
Date: Wed, 10 Jul 2019 17:45:51 +0200
Subject: [PATCH 1/2] Rename memory.c to mpalloc.c for consistency with the
 header file.

---
 Modules/_decimal/libmpdec/README.txt              | 2 +-
 Modules/_decimal/libmpdec/{memory.c => mpalloc.c} | 0
 setup.py                                          | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename Modules/_decimal/libmpdec/{memory.c => mpalloc.c} (100%)

diff --git a/Modules/_decimal/libmpdec/README.txt b/Modules/_decimal/libmpdec/README.txt
index 96b72232d2ad7c..8ceb03cf5f083e 100644
--- a/Modules/_decimal/libmpdec/README.txt
+++ b/Modules/_decimal/libmpdec/README.txt
@@ -20,7 +20,7 @@ Files required for the Python _decimal module
     context.c        ->  Context functions.
     io.{c,h}         ->  Conversions between mpd_t and ASCII strings,
                          mpd_t formatting (allows UTF-8 fill character).
-    memory.{c,h}     ->  Allocation handlers with overflow detection
+    mpalloc.{c,h}    ->  Allocation handlers with overflow detection
                          and functions for switching between static
                          and dynamic mpd_t.
     mpdecimal.{c,h}  ->  All (quiet) functions of the specification.
diff --git a/Modules/_decimal/libmpdec/memory.c b/Modules/_decimal/libmpdec/mpalloc.c
similarity index 100%
rename from Modules/_decimal/libmpdec/memory.c
rename to Modules/_decimal/libmpdec/mpalloc.c
diff --git a/setup.py b/setup.py
index e54d31f5333806..3ec89cedfd5759 100644
--- a/setup.py
+++ b/setup.py
@@ -2095,7 +2095,7 @@ def detect_decimal(self):
               '_decimal/libmpdec/fnt.c',
               '_decimal/libmpdec/fourstep.c',
               '_decimal/libmpdec/io.c',
-              '_decimal/libmpdec/memory.c',
+              '_decimal/libmpdec/mpalloc.c',
               '_decimal/libmpdec/mpdecimal.c',
               '_decimal/libmpdec/numbertheory.c',
               '_decimal/libmpdec/sixstep.c',

From 845e8e48ba8527c8ae9f7ca088c6c61a036eac05 Mon Sep 17 00:00:00 2001
From: Stefan Krah <skrah@bytereef.org>
Date: Wed, 10 Jul 2019 18:02:18 +0200
Subject: [PATCH 2/2] Fix Visual Studio build.

---
 PCbuild/_decimal.vcxproj         | 2 +-
 PCbuild/_decimal.vcxproj.filters | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj
index 465a7ade9a01d1..f0f387f3bfaa5a 100644
--- a/PCbuild/_decimal.vcxproj
+++ b/PCbuild/_decimal.vcxproj
@@ -131,7 +131,7 @@
     <ClCompile Include="..\Modules\_decimal\libmpdec\fnt.c" />
     <ClCompile Include="..\Modules\_decimal\libmpdec\fourstep.c" />
     <ClCompile Include="..\Modules\_decimal\libmpdec\io.c" />
-    <ClCompile Include="..\Modules\_decimal\libmpdec\memory.c" />
+    <ClCompile Include="..\Modules\_decimal\libmpdec\mpalloc.c" />
     <ClCompile Include="..\Modules\_decimal\libmpdec\mpdecimal.c" />
     <ClCompile Include="..\Modules\_decimal\libmpdec\numbertheory.c" />
     <ClCompile Include="..\Modules\_decimal\libmpdec\sixstep.c" />
diff --git a/PCbuild/_decimal.vcxproj.filters b/PCbuild/_decimal.vcxproj.filters
index 7e19aa2f659615..1aa9d020d672fd 100644
--- a/PCbuild/_decimal.vcxproj.filters
+++ b/PCbuild/_decimal.vcxproj.filters
@@ -92,7 +92,7 @@
     <ClCompile Include="..\Modules\_decimal\libmpdec\io.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\_decimal\libmpdec\memory.c">
+    <ClCompile Include="..\Modules\_decimal\libmpdec\mpalloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\Modules\_decimal\libmpdec\mpdecimal.c">