ObjFW  Check-in [915525194c]

Overview
Comment:OFSystemInfo: Fix shadowed variable on illumos
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 915525194c781926739c14fcc298f703afc6b147cd14eca868664808907a39fd
User & Date: js on 2023-04-23 11:42:39
Other Links: manifest | tags
Context
2023-04-23
12:00
PLATFORMS.md: Update Solaris check-in: 6b8ce15d4d user: js tags: trunk
11:42
OFSystemInfo: Fix shadowed variable on illumos check-in: 915525194c user: js tags: trunk
10:00
Check whether we need -Wno-strict-prototypes check-in: b8a90c1477 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/OFSystemInfo.m from [6c16836067] to [88309917a4].

︙
166
167
168
169
170
171
172
173

174
175

176
177
178
179

180
181
182
183
184
185
186

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 utsname;
	struct utsname name;

	if (uname(&utsname) != 0)
	if (uname(&name) != 0)
		return;

	operatingSystemName = [[OFString alloc]
	    initWithCString: utsname.sysname
	    initWithCString: name.sysname
		   encoding: [OFLocale encoding]];
#endif
}

static void
initOperatingSystemVersion(void)
{
︙
263
264
265
266
267
268
269
270

271
272

273
274
275
276

277
278
279
280
281
282
283

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 utsname;
	struct utsname name;

	if (uname(&utsname) != 0)
	if (uname(&name) != 0)
		return;

	operatingSystemVersion = [[OFString alloc]
	    initWithCString: utsname.release
	    initWithCString: name.release
		   encoding: [OFLocale encoding]];
#endif
}

#ifdef OF_NINTENDO_SWITCH
static OFIRI *tmpFSIRI = nil;
︙

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.022s