From 6a54c84a72bc53e532003250c215bf3a5a6affd1 Mon Sep 17 00:00:00 2001
From: fredkiefer <fredkiefer@72102866-910b-0410-8b05-ffd578937521>
Date: Sat, 22 Oct 2011 13:59:05 +0000
Subject: [PATCH] * Source/NSProcessInfo.m: Add includes needed for the
 HAVE_PROCFS case. * Source/common.h: Correct last commit, the #endif was
 placed incorrectly.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34041 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog              | 7 +++++++
 Source/NSProcessInfo.m | 2 ++
 Source/common.h        | 8 ++++----
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a16fe06b..bb3ec1057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-22  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSProcessInfo.m: Add includes needed for the HAVE_PROCFS
+	case.
+	* Source/common.h: Correct last commit, the #endif was placed
+	incorrectly.
+
 2011-10-20  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/common.h: Attempt to workaroiund clang __blockproblem
diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m
index dcde78353..1eb2a3f79 100644
--- a/Source/NSProcessInfo.m
+++ b/Source/NSProcessInfo.m
@@ -105,9 +105,11 @@
 #import "GNUstepBase/GSConfig.h"
 #import "Foundation/NSArray.h"
 #import "Foundation/NSSet.h"
+#import "Foundation/NSCharacterSet.h"
 #import "Foundation/NSDictionary.h"
 #import "Foundation/NSDate.h"
 #import "Foundation/NSException.h"
+#import "Foundation/NSFileManager.h"
 #import "Foundation/NSProcessInfo.h"
 #import "Foundation/NSAutoreleasePool.h"
 #import "Foundation/NSHost.h"
diff --git a/Source/common.h b/Source/common.h
index dfbebfcbf..7d97bf840 100644
--- a/Source/common.h
+++ b/Source/common.h
@@ -59,10 +59,10 @@
 #    include <unistd.h>
 #    undef __block
 #    define __block __attribute__((__blocks__(byref)))
+#  else
+#    define __block __gs_unistd_block
+#    include <unistd.h>
+#    undef __block
 #  endif
-#else
-#  define __block __gs_unistd_block
-#  include <unistd.h>
-#  undef __block
 #endif