gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 09:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use __MINGW32__ rather than __MINGW__ because gcc does that too.

Browse source 
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:
CaS 2005-10-11 19:09:26 +00:00
parent 9ce257fccf
commit 620e39b898
40 changed files with 247 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/NSBundle.m
View file

@ -374,7 +374,7 @@ _find_framework(NSString *name)
bundlePath = [bundlePath stringByDeletingLastPathComponent];
}
/* There are no Versions on MinGW. Skip the Versions check here. */
#if !defined(__MINGW__)
#if !defined(__MINGW32__)
/* version name */
bundlePath = [bundlePath stringByDeletingLastPathComponent];
@ -393,7 +393,7 @@ _find_framework(NSString *name)
if (bundlePath)
bundle = [[self alloc] initWithPath: bundlePath];
}
#if !defined(__MINGW__)
#if !defined(__MINGW32__)
}
#endif
@ -1586,7 +1586,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
mangledName = [mangledName stringByReplacingString: @"+"
withString: @"_1"];
#if !defined(__MINGW__)
#if !defined(__MINGW32__)
path = [_path stringByAppendingPathComponent:@"Versions/Current"];
#else
path = _path;
@ -1614,7 +1614,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
if (_bundleType == NSBUNDLE_FRAMEWORK)
{
#if !defined(__MINGW__)
#if !defined(__MINGW32__)
return [_path stringByAppendingPathComponent:
[NSString stringWithFormat:@"Versions/%@/Resources",
version]];
@ -1665,7 +1665,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
if (_bundleType == NSBUNDLE_FRAMEWORK)
{
#if !defined(__MINGW__)
#if !defined(__MINGW32__)
return [_path stringByAppendingPathComponent:
[NSString stringWithFormat:@"Versions/%@/PlugIns",
version]];
@ -1757,7 +1757,7 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
{
pathlist = [env objectForKey:@"Path"];
}
#if defined(__MINGW__)
#if defined(__MINGW32__)
patharr = [pathlist componentsSeparatedByString:@";"];
#else
patharr = [pathlist componentsSeparatedByString:@":"];