Index: src/OFMutableString.m ================================================================== --- src/OFMutableString.m +++ src/OFMutableString.m @@ -172,11 +172,10 @@ initWithContentsOfFile: path encoding: encoding]; } #endif -#if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) - (instancetype)initWithContentsOfURL: (OFURL *)URL { return (id)[[OFMutableUTF8String alloc] initWithContentsOfURL: URL]; } @@ -185,11 +184,10 @@ { return (id)[[OFMutableUTF8String alloc] initWithContentsOfURL: URL encoding: encoding]; } -#endif - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFMutableUTF8String alloc] initWithSerialization: element]; } Index: src/OFString.h ================================================================== --- src/OFString.h +++ src/OFString.h @@ -515,11 +515,10 @@ */ + (instancetype)stringWithContentsOfFile: (OFString *)path encoding: (of_string_encoding_t)encoding; # endif -# if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) /** * @brief Creates a new OFString with the contents of the specified URL. * * If the URL's scheme is file, it tries UTF-8 encoding. * @@ -540,11 +539,10 @@ * @param encoding The encoding to assume * @return A new autoreleased OFString */ + (instancetype)stringWithContentsOfURL: (OFURL *)URL encoding: (of_string_encoding_t)encoding; -# endif /** * @brief Initializes an already allocated OFString from a UTF-8 encoded C * string. * Index: src/OFString.m ================================================================== --- src/OFString.m +++ src/OFString.m @@ -569,11 +569,10 @@ return (id)[[OFUTF8String alloc] initWithContentsOfFile: path encoding: encoding]; } #endif -#if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) - (instancetype)initWithContentsOfURL: (OFURL *)URL { return (id)[[OFUTF8String alloc] initWithContentsOfURL: URL]; } @@ -581,11 +580,10 @@ encoding: (of_string_encoding_t)encoding { return (id)[[OFUTF8String alloc] initWithContentsOfURL: URL encoding: encoding]; } -#endif - (instancetype)initWithSerialization: (OFXMLElement *)element { return (id)[[OFUTF8String alloc] initWithSerialization: element]; } @@ -785,11 +783,10 @@ return [[[self alloc] initWithContentsOfFile: path encoding: encoding] autorelease]; } #endif -#if defined(OF_HAVE_FILES) || defined(OF_HAVE_SOCKETS) + (instancetype)stringWithContentsOfURL: (OFURL *)URL { return [[[self alloc] initWithContentsOfURL: URL] autorelease]; } @@ -797,11 +794,10 @@ encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithContentsOfURL: URL encoding: encoding] autorelease]; } -#endif - (instancetype)init { if ([self isMemberOfClass: [OFString class]]) { @try {