pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/xwit Remove conflicting declaration of malloc() an...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0c0bff8af286
branches:  trunk
changeset: 516832:0c0bff8af286
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Jul 29 04:35:02 2006 +0000

description:
Remove conflicting declaration of malloc() and realloc().  Include
stdlib.h instead.

diffstat:

 x11/xwit/distinfo         |   3 ++-
 x11/xwit/patches/patch-ab |  30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r 9e8c9a1fe3c7 -r 0c0bff8af286 x11/xwit/distinfo
--- a/x11/xwit/distinfo Sat Jul 29 02:28:19 2006 +0000
+++ b/x11/xwit/distinfo Sat Jul 29 04:35:02 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 17:36:26 wiz Exp $
+$NetBSD: distinfo,v 1.4 2006/07/29 04:35:02 minskim Exp $
 
 SHA1 (xwit-3.4.tar.gz) = 916f32c200f8bd5d30738b9added84612c1366ae
 RMD160 (xwit-3.4.tar.gz) = 62a92780352e81130e8d894e377744b61c67bd90
 Size (xwit-3.4.tar.gz) = 14536 bytes
 SHA1 (patch-aa) = cd63c5ad56acd9ce0c2ff8c3e278f33871a67b24
+SHA1 (patch-ab) = c9cd41f627b57075ad08303bb0ff5a6993e2bc10
diff -r 9e8c9a1fe3c7 -r 0c0bff8af286 x11/xwit/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xwit/patches/patch-ab Sat Jul 29 04:35:02 2006 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.1 2006/07/29 04:35:02 minskim Exp $
+
+--- dsimple.c.orig     1995-10-18 23:59:17.000000000 +0000
++++ dsimple.c
+@@ -5,6 +5,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ /*
+  * Other_stuff.h: Definitions of routines in other_stuff.
+  *
+@@ -46,7 +47,7 @@ extern int screen;
+ char *Malloc(size)
+      unsigned size;
+ {
+-      char *data, *malloc();
++      char *data;
+ 
+       if (!(data = malloc(size)))
+         Fatal_Error("Out of memory!");
+@@ -62,7 +63,7 @@ char *Realloc(ptr, size)
+         char *ptr;
+         int size;
+ {
+-      char *new_ptr, *realloc();
++      char *new_ptr;
+ 
+       if (!ptr)
+         return(Malloc(size));



Home | Main Index | Thread Index | Old Index