[Python-checkins] cpython: Issue #26846: Workaround for non-standard stdlib.h on Android.

[stefan.krah]

https://hg.python.org/cpython/rev/fae01d14dd4e
changeset:   101144:fae01d14dd4e
user:        Stefan Krah <skrah at bytereef.org>
date:        Mon Apr 25 22:48:42 2016 +0200
summary:
  Issue #26846: Workaround for non-standard stdlib.h on Android.

files:
  Modules/_decimal/libmpdec/basearith.c |  1 -
  Modules/_decimal/libmpdec/io.c        |  1 -
  Modules/_decimal/libmpdec/memory.c    |  2 +-
  Modules/_decimal/libmpdec/mpalloc.h   |  4 ++--
  Modules/_decimal/libmpdec/mpdecimal.c |  2 +-
  5 files changed, 4 insertions(+), 6 deletions(-)


diff --git a/Modules/_decimal/libmpdec/basearith.c b/Modules/_decimal/libmpdec/basearith.c
--- 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
--- 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
--- 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
rename from Modules/_decimal/libmpdec/memory.h
rename to Modules/_decimal/libmpdec/mpalloc.h
--- 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
--- 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"
 

-- 
Repository URL: https://hg.python.org/cpython