From 89770a4ccf8f53d8ce5affb89f7512b596b454f8 Mon Sep 17 00:00:00 2001 From: "Wolfgang (Blub) Bumiller" Date: Fri, 26 Feb 2010 16:23:26 +0100 Subject: [PATCH] fixing up merge --- zone.c | 2 +- zone.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zone.c b/zone.c index b1891951..4a173112 100644 --- a/zone.c +++ b/zone.c @@ -665,7 +665,7 @@ void *Mem_ExpandableArray_AllocRecordAtIndex(memexpandablearray_t *l, size_t ind return NULL; } -void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l) +void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l, size_t *out_id) { size_t i, j; for (i = 0;;i++) diff --git a/zone.h b/zone.h index 065f1c0c..b0f81d23 100644 --- a/zone.h +++ b/zone.h @@ -121,7 +121,7 @@ memexpandablearray_t; void Mem_ExpandableArray_NewArray(memexpandablearray_t *l, mempool_t *mempool, size_t recordsize, int numrecordsperarray); void Mem_ExpandableArray_FreeArray(memexpandablearray_t *l); -void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l); +void *Mem_ExpandableArray_AllocRecord_Id(memexpandablearray_t *l, size_t *out_id = 0); void *Mem_ExpandableArray_AllocRecordAtIndex(memexpandablearray_t *l, size_t index); void Mem_ExpandableArray_FreeRecord(memexpandablearray_t *l, void *record); size_t Mem_ExpandableArray_IndexRange(const memexpandablearray_t *l) DP_FUNC_PURE; -- 2.39.2