Differences From Artifact [6c16836067]:
- File
src/OFSystemInfo.m
— part of check-in
[b7a4e61b88]
at
2023-04-22 20:22:08
on branch trunk
— Rename x86_64 to AMD64
It's just a less awkward name and also what the BSDs use. (user: js, size: 22905) [annotate] [blame] [check-ins using]
To Artifact [88309917a4]:
- File src/OFSystemInfo.m — part of check-in [915525194c] at 2023-04-23 11:42:39 on branch trunk — OFSystemInfo: Fix shadowed variable on illumos (user: js, size: 22887) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
166 167 168 169 170 171 172 | #elif defined(OF_PSP) operatingSystemName = @"PlayStation Portable"; #elif defined(OF_DJGPP) operatingSystemName = [[OFString alloc] initWithCString: _os_flavor encoding: OFStringEncodingASCII]; #elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME) | | | | | 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 |
#elif defined(OF_PSP)
operatingSystemName = @"PlayStation Portable";
#elif defined(OF_DJGPP)
operatingSystemName = [[OFString alloc]
initWithCString: _os_flavor
encoding: OFStringEncodingASCII];
#elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME)
struct utsname name;
if (uname(&name) != 0)
return;
operatingSystemName = [[OFString alloc]
initWithCString: name.sysname
encoding: [OFLocale encoding]];
#endif
}
static void
initOperatingSystemVersion(void)
{
|
| ︙ | ︙ | |||
263 264 265 266 267 268 269 |
#elif defined(OF_DJGPP)
operatingSystemVersion = [[OFString alloc]
initWithFormat: @"%u.%u", _osmajor, _osminor];
#elif defined(OF_WII) || defined(NINTENDO_3DS) || defined(OF_NINTENDO_DS) || \
defined(OF_PSP)
/* Intentionally nothing */
#elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME)
| | | | | 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 |
#elif defined(OF_DJGPP)
operatingSystemVersion = [[OFString alloc]
initWithFormat: @"%u.%u", _osmajor, _osminor];
#elif defined(OF_WII) || defined(NINTENDO_3DS) || defined(OF_NINTENDO_DS) || \
defined(OF_PSP)
/* Intentionally nothing */
#elif defined(HAVE_SYS_UTSNAME_H) && defined(HAVE_UNAME)
struct utsname name;
if (uname(&name) != 0)
return;
operatingSystemVersion = [[OFString alloc]
initWithCString: name.release
encoding: [OFLocale encoding]];
#endif
}
#ifdef OF_NINTENDO_SWITCH
static OFIRI *tmpFSIRI = nil;
|
| ︙ | ︙ |