From: Stefan Krah <skrah@bytereef.org>
Date: Mon, 25 Apr 2016 20:48:42 +0000 (+0200)
Subject: Issue #26846: Workaround for non-standard stdlib.h on Android.
X-Git-Tag: v3.6.0a1~119
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e1da5823b4dabbc5e60f8ee27411070a37804ef;p=thirdparty%2FPython%2Fcpython.git

Issue #26846: Workaround for non-standard stdlib.h on Android.
---

diff --git a/Modules/_decimal/libmpdec/basearith.c b/Modules/_decimal/libmpdec/basearith.c
index 35de6b828491..dfe1523927a4 100644
--- a/Modules/_decimal/libmpdec/basearith.c
+++ b/Modules/_decimal/libmpdec/basearith.c
@@ -32,7 +32,6 @@
 #include <string.h>
 #include <assert.h>
 #include "constants.h"
-#include "memory.h"
 #include "typearith.h"
 #include "basearith.h"
 
diff --git a/Modules/_decimal/libmpdec/io.c b/Modules/_decimal/libmpdec/io.c
index a45a429dbf1d..3aadfb043797 100644
--- a/Modules/_decimal/libmpdec/io.c
+++ b/Modules/_decimal/libmpdec/io.c
@@ -37,7 +37,6 @@
 #include <locale.h>
 #include "bits.h"
 #include "constants.h"
-#include "memory.h"
 #include "typearith.h"
 #include "io.h"
 
diff --git a/Modules/_decimal/libmpdec/memory.c b/Modules/_decimal/libmpdec/memory.c
index 61eb6336eb96..a854e09911bd 100644
--- a/Modules/_decimal/libmpdec/memory.c
+++ b/Modules/_decimal/libmpdec/memory.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "typearith.h"
-#include "memory.h"
+#include "mpalloc.h"
 
 
 #if defined(_MSC_VER)
diff --git a/Modules/_decimal/libmpdec/memory.h b/Modules/_decimal/libmpdec/mpalloc.h
similarity index 98%
rename from Modules/_decimal/libmpdec/memory.h
rename to Modules/_decimal/libmpdec/mpalloc.h
index 9c98d1a4000d..efd711953a39 100644
--- a/Modules/_decimal/libmpdec/memory.h
+++ b/Modules/_decimal/libmpdec/mpalloc.h
@@ -26,8 +26,8 @@
  */
 
 
-#ifndef MEMORY_H
-#define MEMORY_H
+#ifndef MPALLOC_H
+#define MPALLOC_H
 
 
 #include "mpdecimal.h"
diff --git a/Modules/_decimal/libmpdec/mpdecimal.c b/Modules/_decimal/libmpdec/mpdecimal.c
index 593f9f5e03a5..328ab9224628 100644
--- a/Modules/_decimal/libmpdec/mpdecimal.c
+++ b/Modules/_decimal/libmpdec/mpdecimal.c
@@ -36,7 +36,7 @@
 #include "bits.h"
 #include "convolute.h"
 #include "crt.h"
-#include "memory.h"
+#include "mpalloc.h"
 #include "typearith.h"
 #include "umodarith.h"