gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes to get stuff to work after autoconf changes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13578 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-05-02 21:22:06 +00:00
parent 9824bb0bbc
commit 79f3f57034
24 changed files with 135 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/NSData.m
View file

@ -79,11 +79,11 @@
#include <Foundation/NSZone.h>
#include <stdio.h>
#include <string.h> /* for memset() */
#if HAVE_UNISTD_H
#ifdef HAVE_UNISTD_H
#include <unistd.h> /* SEEK_* on SunOS 4 */
#endif
#if HAVE_MMAP
#ifdef HAVE_MMAP
#include <unistd.h>
#include <sys/mman.h>
#include <fcntl.h>
@ -97,7 +97,7 @@
#include <sys/stat.h>
#endif
#if HAVE_SHMCTL
#ifdef HAVE_SHMCTL
#include <sys/ipc.h>
#include <sys/shm.h>
@ -351,12 +351,12 @@ failure:
- (void) _grow: (unsigned int)minimum;
@end
#if HAVE_MMAP
#ifdef HAVE_MMAP
@interface NSDataMappedFile : NSDataMalloc
@end
#endif
#if HAVE_SHMCTL
#ifdef HAVE_SHMCTL
@interface NSDataShared : NSDataMalloc
{
int shmid;
@ -443,7 +443,7 @@ failure:
{
NSData *d;
#if HAVE_MMAP
#ifdef HAVE_MMAP
d = [NSDataMappedFile allocWithZone: NSDefaultMallocZone()];
d = [d initWithContentsOfMappedFile: path];
#else
@ -529,7 +529,7 @@ failure:
- (id) initWithContentsOfMappedFile: (NSString *)path
{
#if HAVE_MMAP
#ifdef HAVE_MMAP
RELEASE(self);
self = [NSDataMappedFile allocWithZone: GSObjCZone(self)];
return [self initWithContentsOfMappedFile: path];
@ -1306,7 +1306,7 @@ failure:
@implementation NSData (GNUstepExtensions)
+ (id) dataWithShmID: (int)anID length: (unsigned int)length
{
#if HAVE_SHMCTL
#ifdef HAVE_SHMCTL
NSDataShared *d;
d = [NSDataShared allocWithZone: NSDefaultMallocZone()];
@ -1322,7 +1322,7 @@ failure:
{
NSData *d;
#if HAVE_SHMCTL
#ifdef HAVE_SHMCTL
d = [NSDataShared allocWithZone: NSDefaultMallocZone()];
d = [d initWithBytes: bytes length: length];
#else
@ -1870,7 +1870,7 @@ failure:
@implementation NSMutableData (GNUstepExtensions)
+ (id) dataWithShmID: (int)anID length: (unsigned int)length
{
#if HAVE_SHMCTL
#ifdef HAVE_SHMCTL
NSDataShared *d;
d = [NSMutableDataShared allocWithZone: NSDefaultMallocZone()];
@ -1886,7 +1886,7 @@ failure:
{
NSData *d;
#if HAVE_SHMCTL
#ifdef HAVE_SHMCTL
d = [NSMutableDataShared allocWithZone: NSDefaultMallocZone()];
d = [d initWithBytes: bytes length: length];
#else
@ -2429,7 +2429,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
@end
#if HAVE_MMAP
#ifdef HAVE_MMAP
@implementation NSDataMappedFile
+ (id) allocWithZone: (NSZone*)z
{
@ -2497,7 +2497,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
@end
#endif /* HAVE_MMAP */
#if HAVE_SHMCTL
#ifdef HAVE_SHMCTL
@implementation NSDataShared
+ (id) allocWithZone: (NSZone*)z
{
@ -3156,7 +3156,7 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos)
@end
#if HAVE_SHMCTL
#ifdef HAVE_SHMCTL
@implementation NSMutableDataShared
+ (id) allocWithZone: (NSZone*)z
{