internal workaround for clang namespace pollution.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33993 72102866-910b-0410-8b05-ffd578937521
2025-04-23 09:04:13 +00:00 · 2011-10-14 15:46:13 +00:00 · 2011-10-14 15:46:13 +00:00 · eb8b275c1f
commit eb8b275c1f
parent c5301052a1
28 changed files with 39 additions and 81 deletions
--- a/31
+++ b/31
@ -1,3 +1,34 @@
+2011-10-14  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSBundle.m:
+	* Source/NSPathUtilities.m:
+	* Source/NSProcessInfo.m:
+	* Source/NSSocketPort.m:
+	* Source/NSRunLoop.m:
+	* Source/NSMessagePortNameServer.m:
+	* Source/unix/GSRunLoopCtxt.m:
+	* Source/unix/NSStream.m:
+	* Source/GSHTTPURLHandle.m:
+	* Source/NSPage.m:
+	* Source/NSMessagePort.m:
+	* Source/win32/GSFileHandle.m:
+	* Source/NSInvocation.m:
+	* Source/NSFileManager.m:
+	* Source/common.h:
+	* Source/NSString.m:
+	* Source/NSThread.m:
+	* Source/NSData.m:
+	* Source/NSHost.m:
+	* Source/GSNetwork.h:
+	* Source/NSPipe.m:
+	* Source/NSLog.m:
+	* Source/GSFormat.m:
+	* Source/GSFileHandle.m:
+	* Source/NSTask.m:
+	* SSL/GSSSLHandle.m:
+	* Tools/gdnc.m:
+	Move/wrap include of unistd.h to work around clang problem.
+
 2011-10-14  Richard Frith-Macdonald <rfm@gnu.org>

 	* Source/Additions/Unicode.m:
--- a/SSL/GSSSLHandle.m
+++ b/SSL/GSSSLHandle.m
@ -84,9 +84,6 @@
 #endif
 #include <netdb.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif

 static NSString*
 sslError(int err)
--- a/Source/GSFileHandle.m
+++ b/Source/GSFileHandle.m
@ -61,9 +61,6 @@
 #include <netdb.h>

 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif

 /*
 *	Stuff for setting the sockets into non-blocking mode.
--- a/Source/GSFormat.m
+++ b/Source/GSFormat.m
@ -83,9 +83,6 @@

 #include <string.h>		// for strstr()
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <sys/types.h>
 #include <fcntl.h>
 #include <stdio.h>
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@ -50,9 +50,6 @@
 #import "GSPrivate.h"

 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <sys/file.h>

 #ifdef HAVE_SYS_FCNTL_H
--- a/Source/GSNetwork.h
+++ b/Source/GSNetwork.h
@ -28,10 +28,6 @@
   Boston, MA 02111 USA.
   */ 

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@ -60,9 +60,6 @@ NSString * const NSBundleDidLoadNotification = @"NSBundleDidLoadNotification";
 NSString * const NSShowNonLocalizedStrings = @"NSShowNonLocalizedStrings";
 NSString * const NSLoadedClasses = @"NSLoadedClasses";

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <string.h>

 static NSFileManager	*
--- a/Source/NSData.m
+++ b/Source/NSData.m
@ -86,14 +86,10 @@
 #import "GSPrivate.h"
 #import "GNUstepBase/NSObject+GNUstepBase.h"
 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>             /* SEEK_* on SunOS 4 */
-#endif

 #ifdef	HAVE_MMAP
-#include	<unistd.h>
-#include	<sys/mman.h>
-#include	<fcntl.h>
+#include <sys/mman.h>
+#include <fcntl.h>
 #ifndef	MAP_FAILED
 #define	MAP_FAILED	((void*)-1)	/* Failure address.	*/
 #endif
--- a/Source/NSFileManager.m
+++ b/Source/NSFileManager.m
@ -77,9 +77,6 @@
 # include <ndir.h>
 #endif

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_WINDOWS_H
 #  include <windows.h>
 #endif
--- a/Source/NSHost.m
+++ b/Source/NSHost.m
@ -42,9 +42,6 @@
 #include <ws2tcpip.h>
 #else
 #include <netdb.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
--- a/Source/NSInvocation.m
+++ b/Source/NSInvocation.m
@ -47,10 +47,6 @@
 #include <sys/mman.h>
 #endif

-#if     defined(HAVE_UNISTD_H)
-#import <unistd.h>
-#endif
-
 #if     defined(HAVE_MMAP)
 #  if   !defined(MAP_ANONYMOUS)
 #    if defined(MAP_ANON)
--- a/Source/NSLog.m
+++ b/Source/NSLog.m
@ -62,11 +62,6 @@
 # endif
 #endif	// HAVE_SYSLOG

-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #import "GSPrivate.h"

 extern NSThread	*GSCurrentThread();
--- a/Source/NSMessagePort.m
+++ b/Source/NSMessagePort.m
@ -50,10 +50,6 @@

 #include <stdio.h>

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include <sys/param.h>		/* for MAXHOSTNAMELEN */
 #include <sys/types.h>
 #include <sys/un.h>
--- a/Source/NSMessagePortNameServer.m
+++ b/Source/NSMessagePortNameServer.m
@ -40,7 +40,6 @@
 #import "GSPortPrivate.h"

 #include <sys/stat.h>
-#include <unistd.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <string.h>
--- a/Source/NSPage.m
+++ b/Source/NSPage.m
@ -27,9 +27,6 @@

 #import "common.h"
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <stdio.h>
 #if __mach__
 #include <mach.h>
--- a/Source/NSPathUtilities.m
+++ b/Source/NSPathUtilities.m
@ -73,9 +73,6 @@

 #import "GSPrivate.h"

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>		// for getuid()
-#endif
 #ifdef	HAVE_PWD_H
 #include <pwd.h>		// for getpwnam_r() and getpwuid_r()
 #endif
--- a/Source/NSPipe.m
+++ b/Source/NSPipe.m
@ -30,9 +30,6 @@

 #import "Foundation/NSFileHandle.h"
 #import "GSPrivate.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif

 /**
 * <p>The NSPipe provides an encapsulation of the UNIX concept of pipe.<br />
--- a/Source/NSProcessInfo.m
+++ b/Source/NSProcessInfo.m
@ -55,9 +55,6 @@
 *************************************************************************/

 #import "common.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif

 #include <stdio.h>
 #include <string.h>
--- a/Source/NSRunLoop.m
+++ b/Source/NSRunLoop.m
@ -59,9 +59,6 @@
 #ifdef HAVE_POLL_F
 #include <poll.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <math.h>
 #include <time.h>
 #include <string.h>		/* for memset() */
--- a/Source/NSSocketPort.m
+++ b/Source/NSSocketPort.m
@ -48,9 +48,6 @@
 #import "GSNetwork.h"

 #include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif

 #ifdef __MINGW__
 #define close closesocket
--- a/Source/NSString.m
+++ b/Source/NSString.m
@ -76,9 +76,6 @@
 #import "GNUstepBase/NSObject+GNUstepBase.h"
 #import "GSPrivate.h"
 #include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <sys/types.h>
 #include <fcntl.h>
 #include <stdio.h>
--- a/Source/NSTask.m
+++ b/Source/NSTask.m
@ -49,9 +49,6 @@
 #import "GSPrivate.h"

 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #include <sys/types.h>
 #if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <fcntl.h>
--- a/Source/NSThread.m
+++ b/Source/NSThread.m
@ -33,9 +33,6 @@

 #import "common.h"
 #define	EXPOSE_NSThread_IVARS	1
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_NANOSLEEP
 #include <time.h>
 #endif
--- a/Source/common.h
+++ b/Source/common.h
@ -47,3 +47,9 @@
 #import	"Foundation/NSBundle.h"
 #import	"GNUstepBase/NSBundle+GNUstepBase.h"

+#ifdef HAVE_UNISTD_H
+#define __block __gs_unistd_block
+#include <unistd.h>
+#undef __block
+#endif
+
--- a/Source/unix/GSRunLoopCtxt.m
+++ b/Source/unix/GSRunLoopCtxt.m
@ -26,9 +26,6 @@
 #ifdef HAVE_POLL_F
 #include <poll.h>
 #endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif

 #define	FDCOUNT	128

--- a/Source/unix/NSStream.m
+++ b/Source/unix/NSStream.m
@ -24,8 +24,6 @@

 #import "common.h"

-#include <unistd.h>
-
 #import "Foundation/NSData.h"
 #import "Foundation/NSArray.h"
 #import "Foundation/NSDictionary.h"
--- a/Source/win32/GSFileHandle.m
+++ b/Source/win32/GSFileHandle.m
@ -54,9 +54,6 @@
 #include <stdio.h>

 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif

 #ifndef	O_BINARY
 #ifdef	_O_BINARY
--- a/Tools/gdnc.m
+++ b/Tools/gdnc.m
@ -20,7 +20,6 @@
 #import	"common.h"

 #include <stdio.h>
-#include <unistd.h>

 #import	"Foundation/NSArray.h"
 #import	"Foundation/NSAutoreleasePool.h"