summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Ostorga <vostorga@gentoo.org>2009-07-07 18:07:27 +0000
committerVictor Ostorga <vostorga@gentoo.org>2009-07-07 18:07:27 +0000
commit2a65816d664a15e67e0fb6a95c7d5813e71059a5 (patch)
tree17e73405b05e2f622d4dc7e9ef467e24e84a1703 /dev-libs/mpatrol/files/mpatrol-1.4.8-gcc44-glibc210.patch
parentImport from Science overlay (diff)
downloadhistorical-2a65816d664a15e67e0fb6a95c7d5813e71059a5.tar.gz
historical-2a65816d664a15e67e0fb6a95c7d5813e71059a5.tar.bz2
historical-2a65816d664a15e67e0fb6a95c7d5813e71059a5.zip
Patch to build against glibc-2.10 thanks to Ryan Hill <dirtyepic@gentoo.org> bug #272505. Fix to doc path bug #241972
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'dev-libs/mpatrol/files/mpatrol-1.4.8-gcc44-glibc210.patch')
-rw-r--r--dev-libs/mpatrol/files/mpatrol-1.4.8-gcc44-glibc210.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/dev-libs/mpatrol/files/mpatrol-1.4.8-gcc44-glibc210.patch b/dev-libs/mpatrol/files/mpatrol-1.4.8-gcc44-glibc210.patch
new file mode 100644
index 000000000000..8fe9315d8370
--- /dev/null
+++ b/dev-libs/mpatrol/files/mpatrol-1.4.8-gcc44-glibc210.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/272505
+
+--- mpatrol-orig/src/mptrace.c
++++ mpatrol/src/mptrace.c
+@@ -268,27 +268,27 @@
+ static XtResource resources[] =
+ {
+ {"alloc", XmCColor, XmRPixel, sizeof(Pixel),
+- (Cardinal) &alcol, XmRString, (XtPointer) "black"},
++ (long) &alcol, XmRString, (XtPointer) "black"},
+ {"base", "Base", XmRInt, sizeof(void *),
+- (Cardinal) &addrbase, XmRImmediate, (XtPointer) NULL},
++ (long) &addrbase, XmRImmediate, (XtPointer) NULL},
+ {"delay", "Delay", XmRInt, sizeof(unsigned long),
+- (Cardinal) &delay, XmRImmediate, (XtPointer) 0},
++ (long) &delay, XmRImmediate, (XtPointer) 0},
+ {"free", XmCColor, XmRPixel, sizeof(Pixel),
+- (Cardinal) &frcol, XmRString, (XtPointer) "white"},
++ (long) &frcol, XmRString, (XtPointer) "white"},
+ {"height", XmCHeight, XmRShort, sizeof(Dimension),
+- (Cardinal) &height, XmRImmediate, (XtPointer) 512},
++ (long) &height, XmRImmediate, (XtPointer) 512},
+ {"internal", XmCColor, XmRPixel, sizeof(Pixel),
+- (Cardinal) &incol, XmRString, (XtPointer) "red"},
++ (long) &incol, XmRString, (XtPointer) "red"},
+ {"space", "Space", XmRInt, sizeof(unsigned long),
+- (Cardinal) &addrspace, XmRImmediate, (XtPointer) 4},
++ (long) &addrspace, XmRImmediate, (XtPointer) 4},
+ {"unalloc", XmCColor, XmRPixel, sizeof(Pixel),
+- (Cardinal) &uncol, XmRString, (XtPointer) "blue"},
++ (long) &uncol, XmRString, (XtPointer) "blue"},
+ {"view-height", XmCHeight, XmRShort, sizeof(Dimension),
+- (Cardinal) &vheight, XmRImmediate, (XtPointer) 256},
++ (long) &vheight, XmRImmediate, (XtPointer) 256},
+ {"view-width", XmCWidth, XmRShort, sizeof(Dimension),
+- (Cardinal) &vwidth, XmRImmediate, (XtPointer) 256},
++ (long) &vwidth, XmRImmediate, (XtPointer) 256},
+ {"width", XmCWidth, XmRShort, sizeof(Dimension),
+- (Cardinal) &width, XmRImmediate, (XtPointer) 512}
++ (long) &width, XmRImmediate, (XtPointer) 512}
+ };
+
+
+--- mpatrol-orig/tools/dmalloc.c
++++ mpatrol/tools/dmalloc.c
+@@ -395,7 +395,7 @@
+ char *
+ bytestring(char *b, size_t s, char *p, size_t l)
+ {
+- char *t;
++ const char *t;
+ size_t i, n;
+
+ for (i = n = 0; (i < s) && (i < l); i++)