mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 08:41:03 +00:00
Use __MINGW32__ rather than __MINGW__ because gcc does that too.
NB. It seems some recent patches put ___MINGW32__ in the public headers ... that needs to be fixed as the headers should be system independent! git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21795 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
9ce257fccf
commit
620e39b898
40 changed files with 247 additions and 247 deletions
|
@ -109,12 +109,12 @@ static BOOL hadChildSignal = NO;
|
|||
static void handleSignal(int sig)
|
||||
{
|
||||
hadChildSignal = YES;
|
||||
#ifndef __MINGW__
|
||||
#ifndef __MINGW32__
|
||||
signal(SIGCHLD, handleSignal);
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef __MINGW__
|
||||
#ifdef __MINGW32__
|
||||
@interface NSConcreteWindowsTask : NSTask
|
||||
{
|
||||
@public
|
||||
|
@ -254,7 +254,7 @@ pty_slave(const char* name)
|
|||
}
|
||||
[gnustep_global_lock unlock];
|
||||
|
||||
#ifndef __MINGW__
|
||||
#ifndef __MINGW32__
|
||||
signal(SIGCHLD, handleSignal);
|
||||
#endif
|
||||
}
|
||||
|
@ -349,7 +349,7 @@ pty_slave(const char* name)
|
|||
return;
|
||||
}
|
||||
|
||||
#ifndef __MINGW__
|
||||
#ifndef __MINGW32__
|
||||
#ifdef HAVE_KILLPG
|
||||
killpg(_taskId, SIGINT);
|
||||
#else
|
||||
|
@ -417,7 +417,7 @@ pty_slave(const char* name)
|
|||
[NSException raise: NSInvalidArgumentException
|
||||
format: @"NSTask - task has not yet launched"];
|
||||
}
|
||||
#ifndef __MINGW__
|
||||
#ifndef __MINGW32__
|
||||
#ifdef HAVE_KILLPG
|
||||
killpg(_taskId, SIGCONT);
|
||||
#else
|
||||
|
@ -608,7 +608,7 @@ pty_slave(const char* name)
|
|||
[NSException raise: NSInvalidArgumentException
|
||||
format: @"NSTask - task has not yet launched"];
|
||||
}
|
||||
#ifndef __MINGW__
|
||||
#ifndef __MINGW32__
|
||||
#ifdef HAVE_KILLPG
|
||||
killpg(_taskId, SIGSTOP);
|
||||
#else
|
||||
|
@ -640,7 +640,7 @@ pty_slave(const char* name)
|
|||
}
|
||||
|
||||
_hasTerminated = YES;
|
||||
#ifndef __MINGW__
|
||||
#ifndef __MINGW32__
|
||||
#ifdef HAVE_KILLPG
|
||||
killpg(_taskId, SIGTERM);
|
||||
#else
|
||||
|
@ -741,7 +741,7 @@ pty_slave(const char* name)
|
|||
full_path = [arch_path stringByAppendingPathComponent: libs];
|
||||
|
||||
lpath = [full_path stringByAppendingPathComponent: prog];
|
||||
#ifdef __MINGW__
|
||||
#ifdef __MINGW32__
|
||||
if ([mgr isExecutableFileAtPath: lpath] == NO
|
||||
&& [mgr isExecutableFileAtPath:
|
||||
(lpath = [lpath stringByAppendingPathExtension: @"exe"])] == NO)
|
||||
|
@ -750,7 +750,7 @@ pty_slave(const char* name)
|
|||
#endif
|
||||
{
|
||||
lpath = [arch_path stringByAppendingPathComponent: prog];
|
||||
#ifdef __MINGW__
|
||||
#ifdef __MINGW32__
|
||||
if ([mgr isExecutableFileAtPath: lpath] == NO
|
||||
&& [mgr isExecutableFileAtPath:
|
||||
(lpath = [lpath stringByAppendingPathExtension: @"exe"])] == NO)
|
||||
|
@ -759,7 +759,7 @@ pty_slave(const char* name)
|
|||
#endif
|
||||
{
|
||||
lpath = [base_path stringByAppendingPathComponent: prog];
|
||||
#ifdef __MINGW__
|
||||
#ifdef __MINGW32__
|
||||
if ([mgr isExecutableFileAtPath: lpath] == NO
|
||||
&& [mgr isExecutableFileAtPath:
|
||||
(lpath = [lpath stringByAppendingPathExtension: @"exe"])] == NO)
|
||||
|
@ -778,7 +778,7 @@ pty_slave(const char* name)
|
|||
}
|
||||
if (lpath != nil)
|
||||
{
|
||||
#ifdef __MINGW__
|
||||
#ifdef __MINGW32__
|
||||
if ([mgr isExecutableFileAtPath: lpath] == NO
|
||||
&& [mgr isExecutableFileAtPath:
|
||||
(lpath = [lpath stringByAppendingPathExtension: @"exe"])]
|
||||
|
@ -903,7 +903,7 @@ pty_slave(const char* name)
|
|||
|
||||
@end
|
||||
|
||||
#ifdef __MINGW__
|
||||
#ifdef __MINGW32__
|
||||
@implementation NSConcreteWindowsTask
|
||||
|
||||
BOOL
|
||||
|
@ -1402,7 +1402,7 @@ GSCheckTasks()
|
|||
setpgrp(getpid(), getpid());
|
||||
#endif
|
||||
#else
|
||||
#if defined(__MINGW__)
|
||||
#if defined(__MINGW32__)
|
||||
pid = (int)GetCurrentProcessId(),
|
||||
#else
|
||||
pid = (int)getpid();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue