158 lines
6.2 KiB
Diff
158 lines
6.2 KiB
Diff
diff -Nru Python-3.3.5/Modules/_decimal/libmpdec/basearith.c Python-3.3.5-android/Modules/_decimal/libmpdec/basearith.c
|
|
--- Python-3.3.5/Modules/_decimal/libmpdec/basearith.c 2014-03-09 09:40:25.000000000 +0100
|
|
+++ Python-3.3.5-android/Modules/_decimal/libmpdec/basearith.c 2014-08-05 16:11:29.000000000 +0200
|
|
@@ -32,7 +32,7 @@
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
#include "constants.h"
|
|
-#include "memory.h"
|
|
+#include "mpmemory.h"
|
|
#include "typearith.h"
|
|
#include "basearith.h"
|
|
|
|
diff -Nru Python-3.3.5/Modules/_decimal/libmpdec/io.c Python-3.3.5-android/Modules/_decimal/libmpdec/io.c
|
|
--- Python-3.3.5/Modules/_decimal/libmpdec/io.c 2014-08-05 16:05:22.000000000 +0200
|
|
+++ Python-3.3.5-android/Modules/_decimal/libmpdec/io.c 2014-08-05 16:11:42.000000000 +0200
|
|
@@ -37,7 +37,7 @@
|
|
#include <locale.h>
|
|
#include "bits.h"
|
|
#include "constants.h"
|
|
-#include "memory.h"
|
|
+#include "mpmemory.h"
|
|
#include "typearith.h"
|
|
#include "io.h"
|
|
|
|
diff -Nru Python-3.3.5/Modules/_decimal/libmpdec/memory.c Python-3.3.5-android/Modules/_decimal/libmpdec/memory.c
|
|
--- Python-3.3.5/Modules/_decimal/libmpdec/memory.c 2014-03-09 09:40:25.000000000 +0100
|
|
+++ Python-3.3.5-android/Modules/_decimal/libmpdec/memory.c 2014-08-05 16:11:52.000000000 +0200
|
|
@@ -30,7 +30,7 @@
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include "typearith.h"
|
|
-#include "memory.h"
|
|
+#include "mpmemory.h"
|
|
|
|
|
|
/* Guaranteed minimum allocation for a coefficient. May be changed once
|
|
diff -Nru Python-3.3.5/Modules/_decimal/libmpdec/memory.h Python-3.3.5-android/Modules/_decimal/libmpdec/memory.h
|
|
--- Python-3.3.5/Modules/_decimal/libmpdec/memory.h 2014-03-09 09:40:25.000000000 +0100
|
|
+++ Python-3.3.5-android/Modules/_decimal/libmpdec/memory.h 1970-01-01 01:00:00.000000000 +0100
|
|
@@ -1,51 +0,0 @@
|
|
-/*
|
|
- * Copyright (c) 2008-2016 Stefan Krah. All rights reserved.
|
|
- *
|
|
- * Redistribution and use in source and binary forms, with or without
|
|
- * modification, are permitted provided that the following conditions
|
|
- * are met:
|
|
- *
|
|
- * 1. Redistributions of source code must retain the above copyright
|
|
- * notice, this list of conditions and the following disclaimer.
|
|
- *
|
|
- * 2. Redistributions in binary form must reproduce the above copyright
|
|
- * notice, this list of conditions and the following disclaimer in the
|
|
- * documentation and/or other materials provided with the distribution.
|
|
- *
|
|
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
|
|
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
- * SUCH DAMAGE.
|
|
- */
|
|
-
|
|
-
|
|
-#ifndef MEMORY_H
|
|
-#define MEMORY_H
|
|
-
|
|
-
|
|
-#include "mpdecimal.h"
|
|
-
|
|
-
|
|
-/* Internal header file: all symbols have local scope in the DSO */
|
|
-MPD_PRAGMA(MPD_HIDE_SYMBOLS_START)
|
|
-
|
|
-
|
|
-int mpd_switch_to_dyn(mpd_t *result, mpd_ssize_t size, uint32_t *status);
|
|
-int mpd_switch_to_dyn_zero(mpd_t *result, mpd_ssize_t size, uint32_t *status);
|
|
-int mpd_realloc_dyn(mpd_t *result, mpd_ssize_t size, uint32_t *status);
|
|
-
|
|
-
|
|
-MPD_PRAGMA(MPD_HIDE_SYMBOLS_END) /* restore previous scope rules */
|
|
-
|
|
-
|
|
-#endif
|
|
-
|
|
-
|
|
-
|
|
diff -Nru Python-3.3.5/Modules/_decimal/libmpdec/mpdecimal.c Python-3.3.5-android/Modules/_decimal/libmpdec/mpdecimal.c
|
|
--- Python-3.3.5/Modules/_decimal/libmpdec/mpdecimal.c 2014-03-09 09:40:25.000000000 +0100
|
|
+++ Python-3.3.5-android/Modules/_decimal/libmpdec/mpdecimal.c 2014-08-05 16:12:06.000000000 +0200
|
|
@@ -36,7 +36,7 @@
|
|
#include "bits.h"
|
|
#include "convolute.h"
|
|
#include "crt.h"
|
|
-#include "memory.h"
|
|
+#include "mpmemory.h"
|
|
#include "typearith.h"
|
|
#include "umodarith.h"
|
|
|
|
diff -Nru Python-3.3.5/Modules/_decimal/libmpdec/mpmemory.h Python-3.3.5-android/Modules/_decimal/libmpdec/mpmemory.h
|
|
--- Python-3.3.5/Modules/_decimal/libmpdec/mpmemory.h 1970-01-01 01:00:00.000000000 +0100
|
|
+++ Python-3.3.5-android/Modules/_decimal/libmpdec/mpmemory.h 2014-08-05 16:10:00.000000000 +0200
|
|
@@ -0,0 +1,51 @@
|
|
+/*
|
|
+ * Copyright (c) 2008-2016 Stefan Krah. All rights reserved.
|
|
+ *
|
|
+ * Redistribution and use in source and binary forms, with or without
|
|
+ * modification, are permitted provided that the following conditions
|
|
+ * are met:
|
|
+ *
|
|
+ * 1. Redistributions of source code must retain the above copyright
|
|
+ * notice, this list of conditions and the following disclaimer.
|
|
+ *
|
|
+ * 2. Redistributions in binary form must reproduce the above copyright
|
|
+ * notice, this list of conditions and the following disclaimer in the
|
|
+ * documentation and/or other materials provided with the distribution.
|
|
+ *
|
|
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
|
|
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
+ * SUCH DAMAGE.
|
|
+ */
|
|
+
|
|
+
|
|
+#ifndef MEMORY_H
|
|
+#define MEMORY_H
|
|
+
|
|
+
|
|
+#include "mpdecimal.h"
|
|
+
|
|
+
|
|
+/* Internal header file: all symbols have local scope in the DSO */
|
|
+MPD_PRAGMA(MPD_HIDE_SYMBOLS_START)
|
|
+
|
|
+
|
|
+int mpd_switch_to_dyn(mpd_t *result, mpd_ssize_t size, uint32_t *status);
|
|
+int mpd_switch_to_dyn_zero(mpd_t *result, mpd_ssize_t size, uint32_t *status);
|
|
+int mpd_realloc_dyn(mpd_t *result, mpd_ssize_t size, uint32_t *status);
|
|
+
|
|
+
|
|
+MPD_PRAGMA(MPD_HIDE_SYMBOLS_END) /* restore previous scope rules */
|
|
+
|
|
+
|
|
+#endif
|
|
+
|
|
+
|
|
+
|