mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-29 16:01:38 +00:00
Shared library on Windows fixes
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@6768 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
6bccc28a4d
commit
474cb8d525
16 changed files with 580 additions and 1367 deletions
|
@ -79,6 +79,7 @@
|
|||
/* Define to turn off NSAssertions. */
|
||||
#define NS_BLOCK_ASSERTIONS 1
|
||||
|
||||
#define IN_NSZONE_M 1
|
||||
|
||||
#include <config.h>
|
||||
#include <base/preface.h>
|
||||
|
@ -410,7 +411,7 @@ NSZone* __nszone_private_hidden_default_zone = &default_zone;
|
|||
*/
|
||||
static NSZone *zone_list = 0;
|
||||
|
||||
inline NSZone*
|
||||
GS_DECLARE NSZone*
|
||||
NSZoneFromPointer(void *ptr)
|
||||
{
|
||||
NSZone *zone;
|
||||
|
@ -1695,56 +1696,12 @@ NSCreateZone (size_t start, size_t gran, BOOL canFree)
|
|||
return newZone;
|
||||
}
|
||||
|
||||
inline NSZone*
|
||||
NSDefaultMallocZone (void)
|
||||
{
|
||||
return __nszone_private_hidden_default_zone;
|
||||
}
|
||||
|
||||
NSZone* GSAtomicMallocZone (void)
|
||||
{
|
||||
return NSDefaultMallocZone();
|
||||
}
|
||||
|
||||
inline void*
|
||||
NSZoneMalloc (NSZone *zone, size_t size)
|
||||
{
|
||||
if (!zone)
|
||||
zone = NSDefaultMallocZone();
|
||||
return (zone->malloc)(zone, size);
|
||||
}
|
||||
|
||||
void*
|
||||
NSZoneCalloc (NSZone *zone, size_t elems, size_t bytes)
|
||||
{
|
||||
return memset(NSZoneMalloc(zone, elems*bytes), 0, elems*bytes);
|
||||
}
|
||||
|
||||
inline void*
|
||||
NSZoneRealloc (NSZone *zone, void *ptr, size_t size)
|
||||
{
|
||||
if (!zone)
|
||||
zone = NSDefaultMallocZone();
|
||||
return (zone->realloc)(zone, ptr, size);
|
||||
}
|
||||
|
||||
inline void
|
||||
NSRecycleZone (NSZone *zone)
|
||||
{
|
||||
if (zone == 0)
|
||||
zone = NSDefaultMallocZone();
|
||||
|
||||
(zone->recycle)(zone);
|
||||
}
|
||||
|
||||
inline void
|
||||
NSZoneFree (NSZone *zone, void *ptr)
|
||||
{
|
||||
if (!zone)
|
||||
zone = NSDefaultMallocZone();
|
||||
(zone->free)(zone, ptr);
|
||||
}
|
||||
|
||||
void
|
||||
NSSetZoneName (NSZone *zone, NSString *name)
|
||||
{
|
||||
|
@ -1758,40 +1715,6 @@ NSSetZoneName (NSZone *zone, NSString *name)
|
|||
[gnustep_global_lock unlock];
|
||||
}
|
||||
|
||||
inline NSString*
|
||||
NSZoneName (NSZone *zone)
|
||||
{
|
||||
if (!zone)
|
||||
zone = NSDefaultMallocZone();
|
||||
return zone->name;
|
||||
}
|
||||
|
||||
/* Not in OpenStep. */
|
||||
|
||||
void*
|
||||
NSZoneMallocAtomic (NSZone *zone, size_t size)
|
||||
{
|
||||
return NSZoneMalloc(GSAtomicMallocZone(), size);
|
||||
}
|
||||
|
||||
/* Not in OpenStep. */
|
||||
inline BOOL
|
||||
NSZoneCheck (NSZone *zone)
|
||||
{
|
||||
if (!zone)
|
||||
zone = NSDefaultMallocZone();
|
||||
return (zone->check)(zone);
|
||||
}
|
||||
|
||||
/* Not in OpenStep. */
|
||||
inline struct NSZoneStats
|
||||
NSZoneStats (NSZone *zone)
|
||||
{
|
||||
if (!zone)
|
||||
zone = NSDefaultMallocZone();
|
||||
return (zone->stats)(zone);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#include <gc.h>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue