diff options
| author | minskim <minskim@pkgsrc.org> | 2006-06-21 14:58:08 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2006-06-21 14:58:08 +0000 |
| commit | 0c9ef264ccc01eced91668c95793f38f736d9687 (patch) | |
| tree | 4a6eb7207dabb8a4dcc6591e53b17ed769beedba /cad | |
| parent | d019f2c46aef08273511df786bf81ffeb03737b5 (diff) | |
| download | pkgsrc-0c9ef264ccc01eced91668c95793f38f736d9687.tar.gz | |
Remove conflicting declaration of calloc() and malloc(); include stdlib.h
instead.
Diffstat (limited to 'cad')
| -rw-r--r-- | cad/fasthenry/distinfo | 6 | ||||
| -rw-r--r-- | cad/fasthenry/patches/patch-ao | 16 | ||||
| -rw-r--r-- | cad/fasthenry/patches/patch-av | 16 |
3 files changed, 29 insertions, 9 deletions
diff --git a/cad/fasthenry/distinfo b/cad/fasthenry/distinfo index 6cb88f49188..7beba676f1d 100644 --- a/cad/fasthenry/distinfo +++ b/cad/fasthenry/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2006/06/21 14:56:51 minskim Exp $ +$NetBSD: distinfo,v 1.10 2006/06/21 14:58:08 minskim Exp $ SHA1 (fasthenry-3.0.19961112/fasthenry-3.0-12Nov96.tar.Z) = 7117fdbaad95929a8d98944dced48cfb3a9e39d0 RMD160 (fasthenry-3.0.19961112/fasthenry-3.0-12Nov96.tar.Z) = 7059c9642c2246abf8101658027df1c89b7cab74 @@ -17,14 +17,14 @@ SHA1 (patch-ak) = ae0e90954eeaaed0e466e23bd5cc65f55f005f32 SHA1 (patch-al) = 989ea3eb31036dd11074585da09fb13f8dc0e121 SHA1 (patch-am) = 0114bbc5f54a672442ddccb6a9680d941d1c623a SHA1 (patch-an) = 8b86bf3bb4b21c22fa4dfd655e180729a54bc67e -SHA1 (patch-ao) = 14644865b6c05770c6ef1baf31de6741e131bcb2 +SHA1 (patch-ao) = b6bad76b1772b19bff8b1afd041bb327e95eff2c SHA1 (patch-ap) = d471013c0eb0bb1acdea6eaa4e6b0d477dda9dc0 SHA1 (patch-aq) = 5bc41637c3f3d8e7c98d1ca33d37c6c7ca27bb7f SHA1 (patch-ar) = 6b269c69f34bec1408f81945b8335046e65bc763 SHA1 (patch-as) = b87a8fa4fe4d3e120f50eb8d7182b94f0de9a301 SHA1 (patch-at) = 21e23295ed9778d074d8bb7f56423903470227c9 SHA1 (patch-au) = 6bb6f94c221d12aeb8ea3a98f9cadfb8b813e0ce -SHA1 (patch-av) = fa677024bdb612d46c1d6dde43c677a127b77399 +SHA1 (patch-av) = 1e52f584d81ba7394d8f876f74fb5d639a160060 SHA1 (patch-aw) = f3c23565502045d21518a40981c4e3170364df54 SHA1 (patch-ax) = 0d63ac982956c51a1f731e879e3a3330fdc3e27a SHA1 (patch-ay) = a1bec67321d965bc28bb7ac6aa665ce736ae7960 diff --git a/cad/fasthenry/patches/patch-ao b/cad/fasthenry/patches/patch-ao index c95c458b8ac..aacd1373de5 100644 --- a/cad/fasthenry/patches/patch-ao +++ b/cad/fasthenry/patches/patch-ao @@ -1,12 +1,22 @@ -$NetBSD: patch-ao,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $ +$NetBSD: patch-ao,v 1.3 2006/06/21 14:58:08 minskim Exp $ ---- src/fasthenry/uglieralloc.c.orig Tue Aug 3 22:17:20 2004 +--- src/fasthenry/uglieralloc.c.orig 2004-08-03 22:17:20.000000000 +0000 +++ src/fasthenry/uglieralloc.c -@@ -54,6 +54,7 @@ operation of Software or Licensed Progra +@@ -54,6 +54,8 @@ operation of Software or Licensed Progra - no attempt is made to make allocation efficient in terms of virtual pages */ #include <stdio.h> ++#include <stdlib.h> +#include <string.h> #define NALLOC 8184 /* >= sizeof(HEADER)*NALLOC bytes sbrk()'d */ #define MAGICN 0xaaaaaaaaL /* used to check fidelity of allocated blks */ +@@ -92,8 +94,6 @@ typedef union header HEADER; + - an alternative to mocore() but should only be used if sbrk() doesnt zero + */ + #define MORECORE(SIZE) (HEADER *)calloc(1, SIZE*sizeof(HEADER)) +-char *calloc(); +-char *malloc(); + + static HEADER *base = NULL; /* base of allocated block list */ + static HEADER *allocp = NULL; /* last allocated block */ diff --git a/cad/fasthenry/patches/patch-av b/cad/fasthenry/patches/patch-av index d3a72f6ea56..ee5dae89bf6 100644 --- a/cad/fasthenry/patches/patch-av +++ b/cad/fasthenry/patches/patch-av @@ -1,12 +1,22 @@ -$NetBSD: patch-av,v 1.2 2004/09/20 02:08:58 dmcmahill Exp $ +$NetBSD: patch-av,v 1.3 2006/06/21 14:58:08 minskim Exp $ ---- src/zbuf/uglieralloc.c.orig Tue Aug 3 22:17:23 2004 +--- src/zbuf/uglieralloc.c.orig 2004-08-03 22:17:23.000000000 +0000 +++ src/zbuf/uglieralloc.c -@@ -54,6 +54,7 @@ operation of Software or Licensed Progra +@@ -54,6 +54,8 @@ operation of Software or Licensed Progra - no attempt is made to make allocation efficient in terms of virtual pages */ #include <stdio.h> ++#include <stdlib.h> +#include <string.h> #define NALLOC 8184 /* >= sizeof(HEADER)*NALLOC bytes sbrk()'d */ #define MAGICN 0xaaaaaaaaL /* used to check fidelity of allocated blks */ +@@ -92,8 +94,6 @@ typedef union header HEADER; + - an alternative to mocore() but should only be used if sbrk() doesnt zero + */ + #define MORECORE(SIZE) (HEADER *)calloc(1, SIZE*sizeof(HEADER)) +-char *calloc(); +-char *malloc(); + + static HEADER *base = NULL; /* base of allocated block list */ + static HEADER *allocp = NULL; /* last allocated block */ |