ObjFW  Check-in [d30dfac8ae]

Overview
Comment:OFData: Fix #ifdef
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: d30dfac8ae7f521da1a46a3972f1a54045d7904a0acf2ff7bbce7fbcdf2b41b7
User & Date: js on 2018-02-15 00:35:54
Other Links: manifest | tags
Context
2018-02-16
21:43
Simplify .travis.yml a lot check-in: a43bd84674 user: js tags: trunk
2018-02-15
00:35
OFData: Fix #ifdef check-in: d30dfac8ae user: js tags: trunk
2018-02-12
21:24
.travis.yml: Add Nintendo 3DS check-in: 04df9b6223 user: js tags: trunk
Changes

Modified src/OFData.h from [40d5270f3b] to [e35dc22fa9].

146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
146
147
148
149
150
151
152

153
154
155
156
157
158
159
160

161
162
163
164
165
166
167







-








-







 *
 * @param path The path of the file
 * @return A new autoreleased OFData
 */
+ (instancetype)dataWithContentsOfFile: (OFString *)path;
#endif

#if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS)
/*!
 * @brief Creates a new OFData with an item size of 1, containing the data of
 *	  the specified URL.
 *
 * @param URL The URL to the contents for the OFData
 * @return A new autoreleased OFData
 */
+ (instancetype)dataWithContentsOfURL: (OFURL *)URL;
#endif

/*!
 * @brief Creates a new OFData with an item size of 1, containing the data of
 *	  the string representation.
 *
 * @param string The string representation of the data
 * @return A new autoreleased OFData

Modified src/OFData.m from [28b1c3f1d0] to [b491272801].

95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
95
96
97
98
99
100
101

102
103
104
105

106
107
108
109
110
111
112







-




-







#ifdef OF_HAVE_FILES
+ (instancetype)dataWithContentsOfFile: (OFString *)path
{
	return [[[self alloc] initWithContentsOfFile: path] autorelease];
}
#endif

#if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS)
+ (instancetype)dataWithContentsOfURL: (OFURL *)URL
{
	return [[[self alloc] initWithContentsOfURL: URL] autorelease];
}
#endif

+ (instancetype)dataWithStringRepresentation: (OFString *)string
{
	return [[[self alloc]
	    initWithStringRepresentation: string] autorelease];
}