From 822381a98f26833c1b56d0d63034145ffd6e1d41 Mon Sep 17 00:00:00 2001 From: mccallum Date: Tue, 19 Mar 1996 01:40:44 +0000 Subject: [PATCH] Include Use OBJC_MALLOC and friends, instead of NX_MALLOC. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1211 72102866-910b-0410-8b05-ffd578937521 --- Source/List.m | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/List.m b/Source/List.m index 90d08d597..77fb11d3a 100644 --- a/Source/List.m +++ b/Source/List.m @@ -1,5 +1,5 @@ /* Implementation of Objective-C NeXT-compatible List object - Copyright (C) 1993,1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc. This file is part of the GNU Objective C Class Library. @@ -21,6 +21,7 @@ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include /* Change this #define to 0 if you want -makeObjectsPerform: and @@ -84,7 +85,7 @@ decrementCount(List *self) [super init]; numElements = 0; maxElements = numSlots; - NX_MALLOC(dataPtr, id, maxElements); + OBJC_MALLOC(dataPtr, id, maxElements); return self; } @@ -97,7 +98,7 @@ decrementCount(List *self) - free { if (dataPtr) - NX_FREE(dataPtr); + OBJC_FREE(dataPtr); return [super free]; } @@ -118,7 +119,7 @@ decrementCount(List *self) - shallowCopy { List *c = [super shallowCopy]; - NX_MALLOC(c->dataPtr, id, maxElements); + OBJC_MALLOC(c->dataPtr, id, maxElements); memcpy(c->dataPtr, dataPtr, numElements * sizeof(id *)); return c; } @@ -162,7 +163,7 @@ decrementCount(List *self) if (numSlots > numElements) { maxElements = numSlots; - NX_REALLOC(dataPtr, id, maxElements); + OBJC_REALLOC(dataPtr, id, maxElements); return self; } return nil; @@ -317,7 +318,7 @@ decrementCount(List *self) { [super read: aStream]; objc_read_types (aStream, "II", &numElements, &maxElements); - NX_MALLOC(dataPtr, id, maxElements); + OBJC_MALLOC(dataPtr, id, maxElements); objc_read_array (aStream, "@", numElements, dataPtr); return self; }