mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-29 16:01:38 +00:00
Fixup some conditional compilation to use __MINGW32__
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22535 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
5c5a0b2e4b
commit
eff71248f2
6 changed files with 30 additions and 28 deletions
|
@ -199,7 +199,7 @@ typedef struct {
|
|||
}
|
||||
@end
|
||||
|
||||
#if defined(__WIN32__)
|
||||
#if defined(__MINGW32__)
|
||||
@interface GSWindowsTimeZone : NSTimeZone
|
||||
{
|
||||
@public
|
||||
|
@ -423,7 +423,7 @@ static NSString *_time_zone_path(NSString *subpath, NSString *type)
|
|||
fileName = [NSTimeZoneClass getTimeZoneFile: name];
|
||||
if (fileName == nil
|
||||
|| ![[NSFileManager defaultManager] fileExistsAtPath: fileName])
|
||||
#if defined(__WIN32__)
|
||||
#if defined(__MINGW32__)
|
||||
{
|
||||
zone = [[GSWindowsTimeZone alloc] initWithName: name data: 0];
|
||||
RELEASE(self);
|
||||
|
@ -437,7 +437,7 @@ static NSString *_time_zone_path(NSString *subpath, NSString *type)
|
|||
#endif
|
||||
data = [NSData dataWithContentsOfFile: fileName];
|
||||
}
|
||||
#if defined(__WIN32__)
|
||||
#if defined(__MINGW32__)
|
||||
if (!data)
|
||||
zone = [[GSWindowsTimeZone alloc] initWithName: name data: data];
|
||||
else
|
||||
|
@ -1405,7 +1405,7 @@ static NSMapTable *absolutes = 0;
|
|||
}
|
||||
#endif
|
||||
|
||||
#if defined(__WIN32__)
|
||||
#if defined(__MINGW32__)
|
||||
/*
|
||||
* Try to get timezone from windows registry.
|
||||
*/
|
||||
|
@ -1898,9 +1898,10 @@ static NSMapTable *absolutes = 0;
|
|||
@end
|
||||
|
||||
/**
|
||||
* This class serves no useful purpose in GNUstep, and is provided
|
||||
* solely for backward compatibility with the OpenStep spec. It is
|
||||
* missing entirely from MacOS-X.
|
||||
* This class serves no useful purpose in GNUstep other than to provide
|
||||
* a backup mechanism for handling abbreviations where the precomputed
|
||||
* data files cannot be found. It is provided primarily for backward
|
||||
* compatibility with the OpenStep spec. It is missing entirely from MacOS-X.
|
||||
*/
|
||||
@implementation NSTimeZoneDetail
|
||||
|
||||
|
@ -2011,7 +2012,7 @@ static NSString *zoneDirs[] = {
|
|||
@end
|
||||
|
||||
|
||||
#if defined(__WIN32__)
|
||||
#if defined(__MINGW32__)
|
||||
/* Timezone information data as stored in the registry */
|
||||
typedef struct TZI_format {
|
||||
LONG Bias;
|
||||
|
@ -2435,7 +2436,7 @@ int dayOfCommonEra(NSTimeInterval when);
|
|||
return timeZoneName;
|
||||
}
|
||||
@end
|
||||
#endif // __WIN32__
|
||||
#endif // __MINGW32__
|
||||
|
||||
|
||||
@implementation GSTimeZone
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue