mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
workaround for conflisct with clang/unistd.h
This commit is contained in:
parent
4b5594c63d
commit
0cd9843f5f
4 changed files with 16 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
|||
2020-02-08 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Headers/Foundation/NSXPCConnection.h: Workaround for clash between
|
||||
unistd.h and clang's reserved word __block
|
||||
|
||||
2020-02-05 Fred Kiefer <fredkiefer@gmx.de>
|
||||
|
||||
* configure.ac: Use pkg-config to check for libxml.
|
||||
|
|
|
@ -28,11 +28,17 @@
|
|||
#include <Foundation/NSObject.h>
|
||||
#include <Foundation/NSError.h>
|
||||
|
||||
#ifdef HAVE_SYS_TYPES_H
|
||||
#include <sys/types.h> // for gid_t and uid_t
|
||||
/* Some versions of unistd.h use __block, but that's a reserved word
|
||||
* for Clang so we temporarily redefine it while including the file.
|
||||
*/
|
||||
#ifdef __block
|
||||
#undef __block
|
||||
#endif
|
||||
|
||||
#define __block __gs_unistd_block
|
||||
#include <unistd.h> // for gid_t and uid_t
|
||||
#undef __block
|
||||
|
||||
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_8, GS_API_LATEST)
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
- (void) dealloc
|
||||
{
|
||||
[_remote release];
|
||||
DEALLOC
|
||||
}
|
||||
- (unichar) characterAtIndex: (NSUInteger)i
|
||||
{
|
||||
|
@ -53,6 +54,7 @@
|
|||
- (void) dealloc
|
||||
{
|
||||
[_remote release];
|
||||
DEALLOC
|
||||
}
|
||||
- (NSUInteger) hash
|
||||
{
|
||||
|
|
|
@ -147,7 +147,7 @@ GSDecimalCompare(NSDecimal left,NSDecimal right)
|
|||
- (void) dealloc
|
||||
{
|
||||
[_remote release];
|
||||
[super dealloc];
|
||||
DEALLOC
|
||||
}
|
||||
-(void) setRemote:(id)remote
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue