minor tweak for colaris compile

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@28378 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2009-07-04 11:28:34 +00:00
parent 62edc2e493
commit bcf438e21a
4 changed files with 26 additions and 15 deletions

View file

@ -1,3 +1,9 @@
2009-07-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSProcessInfo.m: Add daignostic check.
* Source/NSSocketPort.m: Make sure socklen_t is defined.
Shoudl fix bug #26856
2009-06-30 Wolfgang Lux <wolfgang.lux@gmail.com>
* configure.ac:

View file

@ -349,23 +349,23 @@ static NSMutableSet *_debug_set = nil;
BOOL GSDebugSet(NSString *level)
// From GNUStep's
{
static IMP debugImp = 0;
static SEL debugSel;
static IMP debugImp = 0;
static SEL debugSel;
if (debugImp == 0)
if (debugImp == 0)
{
debugSel = @selector(member:);
if (_debug_set == nil)
{
[[NSProcessInfo processInfo] debugSet];
}
debugImp = [_debug_set methodForSelector: debugSel];
debugSel = @selector(member:);
if (_debug_set == nil)
{
[[NSProcessInfo processInfo] debugSet];
}
debugImp = [_debug_set methodForSelector: debugSel];
}
if ((*debugImp)(_debug_set, debugSel, level) == nil)
if ((*debugImp)(_debug_set, debugSel, level) == nil)
{
return NO;
return NO;
}
return YES;
return YES;
}
- (NSMutableSet *) debugSet
@ -373,9 +373,9 @@ BOOL GSDebugSet(NSString *level)
{
if (_debug_set == nil)
{
int argc = [[self arguments] count];
int argc = [[self arguments] count];
NSMutableSet *mySet;
int i;
int i;
mySet = [NSMutableSet new];
for (i = 0; i < argc; i++)

View file

@ -1445,6 +1445,11 @@ BOOL GSDebugSet(NSString *level)
[[NSProcessInfo processInfo] debugSet];
}
debugImp = [_debug_set methodForSelector: debugSel];
if (debugImp == 0)
{
fprintf(stderr, "Unable to set up with [NSProcessInfo-debugSet]\n");
return NO;
}
}
if ((*debugImp)(_debug_set, debugSel, level) == nil)
{

View file

@ -43,6 +43,7 @@
#include "Foundation/NSConnection.h"
#include "Foundation/NSDebug.h"
#include "GSNetwork.h"
#include "GSPortPrivate.h"
#include "GSPrivate.h"
@ -54,7 +55,6 @@
#ifdef __MINGW32__
#define close closesocket
#define socklen_t int
#else
#include <sys/param.h> /* for MAXHOSTNAMELEN */
#include <sys/types.h>