diff --git a/Headers/gnustep/base/objc-malloc.h b/Headers/gnustep/base/objc-malloc.h deleted file mode 100644 index 8698212d0..000000000 --- a/Headers/gnustep/base/objc-malloc.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Memory allocation definitions for Objective-C, easy garbage collection. - Copyright (C) 1993,1994, 1996 Free Software Foundation, Inc. - - Written by: Andrew Kachites McCallum - Date: May 1993 - - This file is part of the GNUstep Base Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#ifndef __objc_malloc_h_GNUSTEP_BASE_INCLUDE -#define __objc_malloc_h_GNUSTEP_BASE_INCLUDE - -/* I do this to make substituting Boehm's Garbage Collection easy. */ -extern void *(*objc_malloc)(size_t); -extern void *(*objc_valloc)(size_t); -extern void *(*objc_atomic_malloc)(size_t); -extern void *(*objc_realloc)(void *, size_t); -extern void *(*objc_calloc)(size_t, size_t); -extern void (*objc_free)(void *); - -#define OBJC_MALLOC(VAR, TYPE, NUM) \ - ((VAR) = (TYPE *) (*objc_malloc)((unsigned)(NUM)*sizeof(TYPE))) -#define OBJC_VALLOC(VAR, TYPE, NUM) \ - ((VAR) = (TYPE *) (*objc_valloc)((unsigned)(NUM)*sizeof(TYPE))) -#define OBJC_ATOMIC_MALLOC(VAR, TYPE, NUM) \ - ((VAR) = (TYPE *) (*objc_atomic_malloc)((unsigned)(NUM)*sizeof(TYPE))) -#define OBJC_REALLOC(VAR, TYPE, NUM) \ - ((VAR) = (TYPE *) (*objc_realloc)((VAR), (unsigned)(NUM)*sizeof(TYPE))) -#define OBJC_CALLOC(VAR, TYPE, NUM) \ - ((VAR) = (TYPE *) (*objc_calloc)((unsigned)(NUM), sizeof(TYPE))) -#define OBJC_FREE(PTR) (*objc_free)((PTR)) - -#ifdef __OBJC__ -extern id MemoryExhaustedException; -#endif - -#endif /* __objc_malloc_h_GNUSTEP_BASE_INCLUDE */ diff --git a/Source/objc-malloc.m b/Source/objc-malloc.m deleted file mode 100644 index 8a58290df..000000000 --- a/Source/objc-malloc.m +++ /dev/null @@ -1,106 +0,0 @@ -/* Memory allocation support for Objective-C: easy garbage collection. - Copyright (C) 1993,1994, 1995, 1996 Free Software Foundation, Inc. - - Written by: Andrew Kachites McCallum - Created: May 1993 - - This file is part of the GNUstep Base Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#ifdef __STDC__ -#include -#else -#define size_t unsigned long -#endif - -#ifdef HAVE_VALLOC -#include -#else -#define valloc malloc -#endif - -#include - -#define CHECK_ZERO_SIZE(S) if (size == 0) size = 1 - -void* -__objc_malloc (size_t size) -{ - void* res; - CHECK_ZERO_SIZE (size); - res = (void*) malloc(size); - if (!res) - [NSException raise: MemoryExhaustedException - format: @"Virtual memory exhausted"]; - return res; -} - -void* -__objc_valloc (size_t size) -{ - void* res; - CHECK_ZERO_SIZE(size); - res = (void*) valloc(size); - if (!res) - [NSException raise: MemoryExhaustedException - format: @"Virtual memory exhausted"]; - return res; -} - -void* -__objc_realloc (void* mem, size_t size) -{ - void* res; - CHECK_ZERO_SIZE(size); - res = (void*) realloc (mem, size); - if (!res) - [NSException raise: MemoryExhaustedException - format: @"Virtual memory exhausted"]; - return res; -} - -void* -__objc_calloc (size_t nelem, size_t size) -{ - void* res; - CHECK_ZERO_SIZE(size); - res = (void*) calloc(nelem, size); - if (!res) - [NSException raise: MemoryExhaustedException - format: @"Virtual memory exhausted"]; - return res; -} - -void -__objc_free (void* mem) -{ - free (mem); -} - -/* We should put - *(void**)obj = 0xdeadface; - into object_dispose(); */ - -/* I do this to make substituting Boehm's Garbage Collector easy. */ -void *(*objc_malloc)(size_t size) = __objc_malloc; -void *(*objc_valloc)(size_t size) = __objc_valloc; -void *(*objc_atomic_malloc)(size_t) = __objc_malloc; -void *(*objc_realloc)(void *optr, size_t size) = __objc_realloc; -void *(*objc_calloc)(size_t nelem, size_t size) = __objc_calloc; -void (*objc_free)(void *optr) = __objc_free; - -NSString *MemoryExhaustedException = @"MemoryExhaustedException";