Merge branch 'master' of ssh://github.com/gnustep/libs-base

Conflicts:
	ChangeLog
This commit is contained in:
Richard Frith-Macdonald 2017-08-21 11:27:13 +01:00
commit 10b865e2d5
3 changed files with 22 additions and 9 deletions

View file

@ -4,6 +4,12 @@
Location error was taken to indicate a redirect rather than looking
at the HTTP status code for a 3xx value.
2017-08-04 Daniel Ferreira <dtf@stanford.edu>
* Headers/Foundation/NSObjCRuntime.h:
Add empty definitions for OSX Availability macros for compatibility
purposes.
2017-07-10 Wolfgang Lux <wolfgang.lux@gmail.com>
* Source/GSString.m (lengthUTF8):

View file

@ -286,13 +286,20 @@ DEFINE_BLOCK_TYPE(NSComparator, NSComparisonResult, id, id);
/**
* Declare Apple availability macros for compatibility purposes as no-ops.
*/
#ifndef NS_CLASS_AVAILABLE
#define NS_CLASS_AVAILABLE(x, y)
#endif
#ifndef NS_AVAILABLE
#define NS_AVAILABLE(x, y)
#endif
#define NS_CLASS_AVAILABLE(...)
#define NS_AVAILABLE(...)
#define NS_AVAILABLE_MAC(...)
#define NS_DEPRECATED(...)
#define NS_DEPRECATED_MAC(...)
#define NS_ENUM_AVAILABLE(...)
#define NS_ENUM_AVAILABLE_MAC(...)
#define NS_ENUM_DEPRECATED(...)
#define NS_ENUM_DEPRECATED_MAC(...)
#define NS_CLASS_AVAILABLE(...)
#define NS_CLASS_DEPRECATED(...)
#define NS_CLASS_AVAILABLE_MAC(...)
#define NS_CLASS_DEPRECATED_MAC(...)
#define NS_UNAVAILABLE
/* Define root class NS macro */
#ifndef NS_ROOT_CLASS

View file

@ -8,7 +8,7 @@ int main()
NSString *a = @"a";
NSString *alpha = @"α"; // @"\u03b1";
NSString *rightarrow = @"→"; // @"\u2192";
NSString *smiley = @"🤐"; // @"\u1f910";
NSString *smiley = @"😀"; // @"\U0001f600";
PASS([a length] == 1, "'a' is one character.")
PASS([alpha length] == 1, "alpha is one character.")
@ -19,7 +19,7 @@ int main()
PASS(strcmp([alpha UTF8String], "\xce\xb1") == 0, "UTF8 encoding for alpha.")
PASS(strcmp([rightarrow UTF8String], "\xe2\x86\x92") == 0,
"UTF8 encoding for rightarrow.")
PASS(strcmp([smiley UTF8String], "\xf0\x9f\xa4\x90") == 0,
PASS(strcmp([smiley UTF8String], "\xf0\x9f\x98\x80") == 0,
"UTF8 encoding for smiley.")
PASS([a canBeConvertedToEncoding: NSISOLatin1StringEncoding] == YES,