summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/utils/m-tx/mtx-0.60d-PATCHES/ChangeLog5
-rw-r--r--Build/source/utils/m-tx/mtx-0.60d-PATCHES/patch-03-different-size16
-rw-r--r--Build/source/utils/m-tx/mtx-0.60d/libp2c/p2c.h4
3 files changed, 23 insertions, 2 deletions
diff --git a/Build/source/utils/m-tx/mtx-0.60d-PATCHES/ChangeLog b/Build/source/utils/m-tx/mtx-0.60d-PATCHES/ChangeLog
index 353e6408b6e..8ca2124cef6 100644
--- a/Build/source/utils/m-tx/mtx-0.60d-PATCHES/ChangeLog
+++ b/Build/source/utils/m-tx/mtx-0.60d-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-10 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-03-different-size: Avoid 'cast to pointer from integer of
+ different size' when sizeof(int) is less than sizeof(void *).
+
2012-10-04 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-02-malloc (new): Check value returned by malloc(), i.e.,
diff --git a/Build/source/utils/m-tx/mtx-0.60d-PATCHES/patch-03-different-size b/Build/source/utils/m-tx/mtx-0.60d-PATCHES/patch-03-different-size
new file mode 100644
index 00000000000..050f564dc87
--- /dev/null
+++ b/Build/source/utils/m-tx/mtx-0.60d-PATCHES/patch-03-different-size
@@ -0,0 +1,16 @@
+diff -ur mtx-0.60d.orig/libp2c/p2c.h mtx-0.60d/libp2c/p2c.h
+--- mtx-0.60d.orig/libp2c/p2c.h 1999-03-16 16:28:20.000000000 +0100
++++ mtx-0.60d/libp2c/p2c.h 2013-04-10 17:40:36.000000000 +0200
+@@ -428,10 +428,10 @@
+
+ /* Memory allocation */
+ #ifdef __GCC__
+-# define Malloc(n) (malloc(n) ?: (Anyptr)_OutMem())
++# define Malloc(n) (malloc(n) ?: (Anyptr)(size_t)_OutMem())
+ #else
+ extern Anyptr __MallocTemp__;
+-# define Malloc(n) ((__MallocTemp__ = malloc(n)) ? __MallocTemp__ : (Anyptr)_OutMem())
++# define Malloc(n) ((__MallocTemp__ = malloc(n)) ? __MallocTemp__ : (Anyptr)(size_t)_OutMem())
+ #endif
+ #define FreeR(p) (free((Anyptr)(p))) /* used if arg is an rvalue */
+ #define Free(p) (free((Anyptr)(p)), (p)=NULL)
diff --git a/Build/source/utils/m-tx/mtx-0.60d/libp2c/p2c.h b/Build/source/utils/m-tx/mtx-0.60d/libp2c/p2c.h
index c8216a6002c..03b95201794 100644
--- a/Build/source/utils/m-tx/mtx-0.60d/libp2c/p2c.h
+++ b/Build/source/utils/m-tx/mtx-0.60d/libp2c/p2c.h
@@ -428,10 +428,10 @@ typedef struct {
/* Memory allocation */
#ifdef __GCC__
-# define Malloc(n) (malloc(n) ?: (Anyptr)_OutMem())
+# define Malloc(n) (malloc(n) ?: (Anyptr)(size_t)_OutMem())
#else
extern Anyptr __MallocTemp__;
-# define Malloc(n) ((__MallocTemp__ = malloc(n)) ? __MallocTemp__ : (Anyptr)_OutMem())
+# define Malloc(n) ((__MallocTemp__ = malloc(n)) ? __MallocTemp__ : (Anyptr)(size_t)_OutMem())
#endif
#define FreeR(p) (free((Anyptr)(p))) /* used if arg is an rvalue */
#define Free(p) (free((Anyptr)(p)), (p)=NULL)