diff options
| author | minskim <minskim> | 2006-06-21 14:58:08 +0000 |
|---|---|---|
| committer | minskim <minskim> | 2006-06-21 14:58:08 +0000 |
| commit | da3629d496722b30ac7ba88a91cdf4b71a1095e1 (patch) | |
| tree | 4a6eb7207dabb8a4dcc6591e53b17ed769beedba /cad/fasthenry/patches | |
| parent | 9cca224de6c2ee77c2589176eccd13794372ecef (diff) | |
| download | pkgsrc-da3629d496722b30ac7ba88a91cdf4b71a1095e1.tar.gz | |
Remove conflicting declaration of calloc() and malloc(); include stdlib.h
instead.
Diffstat (limited to 'cad/fasthenry/patches')
| -rw-r--r-- | cad/fasthenry/patches/patch-ao | 16 | ||||
| -rw-r--r-- | cad/fasthenry/patches/patch-av | 16 |
2 files changed, 26 insertions, 6 deletions
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 */ |