diff options
| author | dim <dim@FreeBSD.org> | 2010-10-21 19:11:14 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2010-10-21 19:11:14 +0000 |
| commit | 844d5c9852c83cc56dccdc017c27f2bfc0928f05 (patch) | |
| tree | 506464413c40d2c6a4a46d04892a9415cb886522 /contrib/binutils/include/objalloc.h | |
| parent | acc1b913a3297e19f9ffe7d2b7b8a3142926d3b4 (diff) | |
| parent | 0acbbeece75076693a5c54ce4d376aa9f021b4e3 (diff) | |
| download | FreeBSD-src-844d5c9852c83cc56dccdc017c27f2bfc0928f05.zip FreeBSD-src-844d5c9852c83cc56dccdc017c27f2bfc0928f05.tar.gz | |
Merge ^vendor/binutils/dist@214082 into contrib/binutils.
Diffstat (limited to 'contrib/binutils/include/objalloc.h')
| -rw-r--r-- | contrib/binutils/include/objalloc.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/binutils/include/objalloc.h b/contrib/binutils/include/objalloc.h index c710647..36772d1 100644 --- a/contrib/binutils/include/objalloc.h +++ b/contrib/binutils/include/objalloc.h @@ -14,8 +14,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +Foundation, 51 Franklin Street - Fifth Floor, +Boston, MA 02110-1301, USA. */ #ifndef OBJALLOC_H #define OBJALLOC_H @@ -45,7 +45,7 @@ struct objalloc { char *current_ptr; unsigned int current_space; - PTR chunks; + void *chunks; }; /* Work out the required alignment. */ @@ -64,12 +64,12 @@ struct objalloc_align { char x; double d; }; /* Create an objalloc structure. Returns NULL if malloc fails. */ -extern struct objalloc *objalloc_create PARAMS ((void)); +extern struct objalloc *objalloc_create (void); /* Allocate space from an objalloc structure. Returns NULL if malloc fails. */ -extern PTR _objalloc_alloc PARAMS ((struct objalloc *, unsigned long)); +extern void *_objalloc_alloc (struct objalloc *, unsigned long); /* The macro version of objalloc_alloc. We only define this if using gcc, because otherwise we would have to evaluate the arguments @@ -94,7 +94,7 @@ extern PTR _objalloc_alloc PARAMS ((struct objalloc *, unsigned long)); (__len <= __o->current_space \ ? (__o->current_ptr += __len, \ __o->current_space -= __len, \ - (PTR) (__o->current_ptr - __len)) \ + (void *) (__o->current_ptr - __len)) \ : _objalloc_alloc (__o, __len)); }) #else /* ! __GNUC__ */ @@ -105,11 +105,11 @@ extern PTR _objalloc_alloc PARAMS ((struct objalloc *, unsigned long)); /* Free an entire objalloc structure. */ -extern void objalloc_free PARAMS ((struct objalloc *)); +extern void objalloc_free (struct objalloc *); /* Free a block allocated by objalloc_alloc. This also frees all more recently allocated blocks. */ -extern void objalloc_free_block PARAMS ((struct objalloc *, PTR)); +extern void objalloc_free_block (struct objalloc *, void *); #endif /* OBJALLOC_H */ |
