ObjFW  Check-in [3cc8b8db2f]

Overview
Comment:OFSystemInfo: iOS has no NSSystemDirectories.h
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 3cc8b8db2fb6448895a38c963b991ab782b0d572c71798de5386e8d6442538ff
User & Date: js on 2015-05-03 13:01:59
Other Links: manifest | tags
Context
2015-05-03
13:23
Update PLATFORMS.md check-in: e0465438de user: js tags: trunk
13:01
OFSystemInfo: iOS has no NSSystemDirectories.h check-in: 3cc8b8db2f user: js tags: trunk
12:44
configure: Don't force -no-integrated-as anymore check-in: a079453537 user: js tags: trunk
Changes

Modified src/OFSystemInfo.m from [2207aef52d] to [2e4f49497d].

30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
#import "OFString.h"
#import "OFArray.h"
#import "OFDictionary.h"
#import "OFApplication.h"

#import "OFNotImplementedException.h"

#ifdef __APPLE__
# include <NSSystemDirectories.h>
#endif
#ifdef _WIN32
# include <windows.h>
#endif
#ifdef __HAIKU__
# include <FindDirectory.h>







|







30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
#import "OFString.h"
#import "OFArray.h"
#import "OFDictionary.h"
#import "OFApplication.h"

#import "OFNotImplementedException.h"

#if defined(__APPLE__) && !defined(OF_IOS)
# include <NSSystemDirectories.h>
#endif
#ifdef _WIN32
# include <windows.h>
#endif
#ifdef __HAIKU__
# include <FindDirectory.h>
133
134
135
136
137
138
139

140
141
142
143
144
145
146
147
{
	/* FIXME */
	return OF_STRING_ENCODING_UTF_8;
}

+ (OFString*)userDataPath
{

#if defined(__APPLE__)
	void *pool = objc_autoreleasePoolPush();
	char pathC[PATH_MAX];
	NSSearchPathEnumerationState state;
	OFMutableString *path;
	OFString *home;

	state = NSStartSearchPathEnumeration(NSApplicationSupportDirectory,







>
|







133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
{
	/* FIXME */
	return OF_STRING_ENCODING_UTF_8;
}

+ (OFString*)userDataPath
{
	/* TODO: Return something more sensible for iOS */
#if defined(__APPLE__) && !defined(OF_IOS)
	void *pool = objc_autoreleasePoolPush();
	char pathC[PATH_MAX];
	NSSearchPathEnumerationState state;
	OFMutableString *path;
	OFString *home;

	state = NSStartSearchPathEnumeration(NSApplicationSupportDirectory,
212
213
214
215
216
217
218

219
220
221
222
223
224
225
226
	objc_autoreleasePoolPop(pool);
	return [var autorelease];
#endif
}

+ (OFString*)userConfigPath
{

#if defined(__APPLE__)
	void *pool = objc_autoreleasePoolPush();
	char pathC[PATH_MAX];
	NSSearchPathEnumerationState state;
	OFMutableString *path;
	OFString *home;

	state = NSStartSearchPathEnumeration(NSLibraryDirectory,







>
|







213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
	objc_autoreleasePoolPop(pool);
	return [var autorelease];
#endif
}

+ (OFString*)userConfigPath
{
	/* TODO: Return something more sensible for iOS */
#if defined(__APPLE__) && !defined(OF_IOS)
	void *pool = objc_autoreleasePoolPush();
	char pathC[PATH_MAX];
	NSSearchPathEnumerationState state;
	OFMutableString *path;
	OFString *home;

	state = NSStartSearchPathEnumeration(NSLibraryDirectory,