Fix all compiler warnings

src/Core/AI.m

@@ -219,7 +219,7 @@ - (void) reportStackOverflow
 			while (count--)
 			{
 				OOPreservedAIStateMachine *preservedMachine = [aiStack objectAtIndex:count];
-				OOLog(@"ai.error.stackOverflow.dump", @"%3llu: %@: %@", count, [preservedMachine name], [preservedMachine state]);
+				OOLog(@"ai.error.stackOverflow.dump", @"%3lu: %@: %@", count, [preservedMachine name], [preservedMachine state]);
 			}
 
 			OOLogOutdent();

src/Core/CollisionRegion.m

@@ -98,7 +98,7 @@ - (void) dealloc
 
 - (NSString *) description
 {
-	return [NSString stringWithFormat:@"<%@ %p>{ID: %d, %llu subregions, %u ents}", [self class], self, crid, [subregions count], n_entities];
+	return [NSString stringWithFormat:@"<%@ %p>{ID: %d, %lu subregions, %u ents}", [self class], self, crid, [subregions count], n_entities];
 }
 
 

src/Core/Debug/OODebugTCPConsoleClient.m

@@ -688,7 +688,7 @@ - (void) breakConnectionWithBadStream:(NSStream *)stream
 	if (errorDesc == nil)  errorDesc = [error description];
 	if (errorDesc == nil)  errorDesc = @"bad stream.";
 	[self breakConnectionWithMessage:[NSString stringWithFormat:
-	   @"Connection to debug console failed: '%@' (outStream status: %llu, inStream status: %llu).",
+	   @"Connection to debug console failed: '%@' (outStream status: %lu, inStream status: %lu).",
 		errorDesc, [_outStream streamStatus], [_inStream streamStatus]]];
 }
 

src/Core/Entities/Entity.m

@@ -218,7 +218,7 @@ - (BOOL) validForAddToUniverse
 	NSUInteger currentSessionID = [UNIVERSE sessionID];
 	if (EXPECT_NOT(mySessionID != currentSessionID))
 	{
-		OOLogERR(@"entity.invalidSession", @"Entity %@ from session %llu cannot be added to universe in session %llu. This is an internal error, please report it.", [self shortDescription], mySessionID, currentSessionID);
+		OOLogERR(@"entity.invalidSession", @"Entity %@ from session %lu cannot be added to universe in session %lu. This is an internal error, please report it.", [self shortDescription], mySessionID, currentSessionID);
 		return NO;
 	}
 

src/Core/Entities/PlayerEntity.m

@@ -1511,7 +1511,7 @@ - (BOOL)setCommanderDataFromDictionary:(NSDictionary *) dict
 	// Do we have extra passengers?
 	if (passengers && ([passengers count] > max_passengers))
 	{
-		OOLogWARN(@"setCommanderDataFromDictionary.inconsistency.passengers", @"player ship %@ had more passengers (%llu) than passenger berths (%u). Removing extra passengers.", [self name], [passengers count], max_passengers);
+		OOLogWARN(@"setCommanderDataFromDictionary.inconsistency.passengers", @"player ship %@ had more passengers (%lu) than passenger berths (%u). Removing extra passengers.", [self name], [passengers count], max_passengers);
 		for (NSInteger i = (NSInteger)[passengers count] - 1; i >= max_passengers; i--)
 		{
 			[passenger_record removeObjectForKey:[[passengers oo_dictionaryAtIndex:i] oo_stringForKey:PASSENGER_KEY_NAME]];
@@ -4914,7 +4914,7 @@ - (NSString *) dial_fpsinfo
 
 - (NSString *) dial_objinfo
 {
-	NSString *result = [NSString stringWithFormat:@"Entities: %3llu", [UNIVERSE entityCount]];
+	NSString *result = [NSString stringWithFormat:@"Entities: %3lu", [UNIVERSE entityCount]];
 #ifndef NDEBUG
 	result = [NSString stringWithFormat:@"%@ (%d, %zu KiB, avg %zu bytes)", result, gLiveEntityCount, gTotalEntityMemory >> 10, gTotalEntityMemory / gLiveEntityCount];
 #endif
@@ -10936,7 +10936,7 @@ - (void) showMarketScreenDataLine:(OOGUIRow)row forGood:(OOCommodityType)good in
 	NSString *available = OOPadStringToEms(((available_units > 0) ? (NSString *)[NSString stringWithFormat:@"%d",available_units] : DESC(@"commodity-quantity-none")), 2.5);
 
 	NSUInteger priceDecimal = pricePerUnit % 10;
-	NSString *price = [NSString stringWithFormat:@" %@.%llu ",OOPadStringToEms([NSString stringWithFormat:@"%lu",(unsigned long)(pricePerUnit/10)],2.5),priceDecimal];
+	NSString *price = [NSString stringWithFormat:@" %@.%lu ",OOPadStringToEms([NSString stringWithFormat:@"%lu",(unsigned long)(pricePerUnit/10)],2.5),priceDecimal];
 
 	// this works with up to 9999 tons of gemstones. Any more than that, they deserve the formatting they get! :)
 
@@ -13464,7 +13464,7 @@ - (void)dumpSelfState
 	OOLog(@"dumpState.playerEntity", @"Missile status: %i", missile_status);
 	OOLog(@"dumpState.playerEntity", @"Energy unit: %@", EnergyUnitTypeToString([self installedEnergyUnitType]));
 	OOLog(@"dumpState.playerEntity", @"Fuel leak rate: %g", fuel_leak_rate);
-	OOLog(@"dumpState.playerEntity", @"Trumble count: %llu", trumbleCount);
+	OOLog(@"dumpState.playerEntity", @"Trumble count: %lu", trumbleCount);
 
 	flags = [NSMutableArray array];
 	#define ADD_FLAG_IF_SET(x)		if (x) { [flags addObject:@#x]; }

src/Core/Entities/PlayerEntityContracts.m

@@ -1540,7 +1540,7 @@ - (void) setGuiToShipyardScreen:(NSUInteger)skip
 			{
 				[gui setColor:[gui colorFromSetting:kGuiShipyardScrollColor defaultValue:[OOColor greenColor]] forRow:GUI_ROW_SHIPYARD_START];
 				[gui setArray:[NSArray arrayWithObjects:DESC(@"gui-back"), @" <-- ", nil] forRow:GUI_ROW_SHIPYARD_START];
-				[gui setKey:[NSString stringWithFormat:@"More:%lld", previous] forRow:GUI_ROW_SHIPYARD_START];
+				[gui setKey:[NSString stringWithFormat:@"More:%ld", previous] forRow:GUI_ROW_SHIPYARD_START];
 			}
 			for (i = 0; i < (shipCount - skip) && (int)i < rowCount; i++)
 			{
@@ -1558,7 +1558,7 @@ - (void) setGuiToShipyardScreen:(NSUInteger)skip
 			{
 				[gui setColor:[gui colorFromSetting:kGuiShipyardScrollColor defaultValue:[OOColor greenColor]] forRow:startRow + i];
 				[gui setArray:[NSArray arrayWithObjects:DESC(@"gui-more"), @" --> ", nil] forRow:startRow + i];
-				[gui setKey:[NSString stringWithFormat:@"More:%llu", rowCount + skip] forRow:startRow + i];
+				[gui setKey:[NSString stringWithFormat:@"More:%lu", rowCount + skip] forRow:startRow + i];
 				i++;
 			}
 

src/Core/Entities/PlayerEntityControls.m

@@ -121,8 +121,10 @@
 static BOOL				musicModeKeyPressed;
 static BOOL				volumeControlPressed;
 static BOOL				fovControlPressed;
+#if OOLITE_WINDOWS
 static BOOL				hdrMaxBrightnessControlPressed;
 static BOOL				hdrPaperWhiteControlPressed;
+#endif
 static BOOL				colorblindModeControlPressed;
 static BOOL				shaderSelectKeyPressed;
 static BOOL				selectPressed;

src/Core/Entities/PlayerEntityKeyMapper.m

@@ -873,7 +873,7 @@ - (void) displayKeyFunctionList:(GuiDisplayGen *)gui skip:(NSUInteger)skip
 		{
 			[gui setColor:[OOColor greenColor] forRow:GUI_ROW_KC_FUNCSTART];
 			[gui setArray:[NSArray arrayWithObjects:DESC(@"gui-back"), @" <-- ", nil] forRow:GUI_ROW_KC_FUNCSTART];
-			[gui setKey:[NSString stringWithFormat:@"More:%lld", previous] forRow:GUI_ROW_KC_FUNCSTART];
+			[gui setKey:[NSString stringWithFormat:@"More:%ld", previous] forRow:GUI_ROW_KC_FUNCSTART];
 		}
 
 		for(i = 0; i < (n_functions - skip) && (int)i < n_rows; i++)
@@ -940,7 +940,7 @@ - (void) displayKeyFunctionList:(GuiDisplayGen *)gui skip:(NSUInteger)skip
 				[gui setArray:[NSArray arrayWithObjects: 
 								[entry objectForKey:KEY_KC_GUIDESC], assignment, override, nil]
 					forRow:i + start_row];
-				[gui setKey:[NSString stringWithFormat:@"Index:%llu", i + skip] forRow:i + start_row];
+				[gui setKey:[NSString stringWithFormat:@"Index:%lu", i + skip] forRow:i + start_row];
 				if (validate) 
 				{
 					[gui setColor:[OOColor orangeColor] forRow:i + start_row];
@@ -951,7 +951,7 @@ - (void) displayKeyFunctionList:(GuiDisplayGen *)gui skip:(NSUInteger)skip
 		{
 			[gui setColor:[OOColor greenColor] forRow:start_row + i];
 			[gui setArray:[NSArray arrayWithObjects:DESC(@"gui-more"), @" --> ", nil] forRow:start_row + i];
-			[gui setKey:[NSString stringWithFormat:@"More:%llu", n_rows + skip] forRow:start_row + i];
+			[gui setKey:[NSString stringWithFormat:@"More:%lu", n_rows + skip] forRow:start_row + i];
 			i++;
 		}
 
@@ -1338,7 +1338,7 @@ - (void) displayKeyboardLayoutList:(GuiDisplayGen *)gui skip:(NSUInteger)skip
 		{
 			[gui setColor:[OOColor greenColor] forRow:GUI_ROW_KC_FUNCSTART];
 			[gui setArray:[NSArray arrayWithObjects:DESC(@"gui-back"), @" <-- ", nil] forRow:GUI_ROW_KC_FUNCSTART];
-			[gui setKey:[NSString stringWithFormat:@"More:%lld", previous] forRow:GUI_ROW_KC_FUNCSTART];
+			[gui setKey:[NSString stringWithFormat:@"More:%ld", previous] forRow:GUI_ROW_KC_FUNCSTART];
 		}
 
 		NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -1351,13 +1351,13 @@ - (void) displayKeyboardLayoutList:(GuiDisplayGen *)gui skip:(NSUInteger)skip
 			NSString *selected = @"";
 			if ([[entry objectForKey:@"key"] isEqualToString:kbd]) selected = @"Current";
 			[gui setArray:[NSArray arrayWithObjects:desc, selected, nil] forRow:i + start_row];
-			[gui setKey:[NSString stringWithFormat:@"Index:%llu", i + skip] forRow:i + start_row];
+			[gui setKey:[NSString stringWithFormat:@"Index:%lu", i + skip] forRow:i + start_row];
 		}
 		if (i < n_functions - skip)
 		{
 			[gui setColor:[OOColor greenColor] forRow:start_row + i];
 			[gui setArray:[NSArray arrayWithObjects:DESC(@"gui-more"), @" --> ", nil] forRow:start_row + i];
-			[gui setKey:[NSString stringWithFormat:@"More:%llu", n_rows + skip] forRow:start_row + i];
+			[gui setKey:[NSString stringWithFormat:@"More:%lu", n_rows + skip] forRow:start_row + i];
 			i++;
 		}
 

src/Core/Entities/PlayerEntityLegacyScriptEngine.m

@@ -1993,7 +1993,7 @@ - (void) setMissionChoicesDictionary:(NSDictionary *)choicesDict
 
 	NSInteger keysCount = [choiceKeys count];
 	if ((end_row + 1) < [choiceKeys count]) {
-		OOLogERR(kOOLogException, @"in mission.runScreen choices: number of choices defined (%llu) is greater than available lines (%llu). Check HUD settings for allowBigGui.",  [choiceKeys count], (end_row + 1));
+		OOLogERR(kOOLogException, @"in mission.runScreen choices: number of choices defined (%lu) is greater than available lines (%lu). Check HUD settings for allowBigGui.",  [choiceKeys count], (end_row + 1));
 		keysCount = end_row + 1;
 	}
 
@@ -2877,7 +2877,7 @@ - (BOOL) addEqScriptForKey:(NSString *)eq_key
 
 	[eqScripts addObject:[NSArray arrayWithObjects:eq_key,s,nil]];
 	if (primedEquipment == [eqScripts count] - 1) primedEquipment++;	// if primed-none, keep it as primed-none.
-	OOLog(@"player.equipmentScript", @"Scriptable equipment available: %llu.", [eqScripts count]);
+	OOLog(@"player.equipmentScript", @"Scriptable equipment available: %lu.", [eqScripts count]);
 	return YES;
 }
 

src/Core/Entities/PlayerEntityStickMapper.m

@@ -452,7 +452,7 @@ - (void) displayFunctionList:(GuiDisplayGen *)gui
 		{
 			[gui setColor:[OOColor greenColor] forRow:GUI_ROW_FUNCSTART];
 			[gui setArray:[NSArray arrayWithObjects:DESC(@"gui-back"), @" <-- ", nil] forRow:GUI_ROW_FUNCSTART];
-			[gui setKey:[NSString stringWithFormat:@"More:%lld", previous] forRow:GUI_ROW_FUNCSTART];
+			[gui setKey:[NSString stringWithFormat:@"More:%ld", previous] forRow:GUI_ROW_FUNCSTART];
 		}
 
 		for(i=0; i < (n_functions - skip) && (int)i < n_rows; i++)
@@ -519,14 +519,14 @@ - (void) displayFunctionList:(GuiDisplayGen *)gui
 								[entry objectForKey: KEY_GUIDESC], assignment, allowedThings, nil]
 					forRow: i + start_row];
 				//[gui setKey: GUI_KEY_OK forRow: i + start_row];
-				[gui setKey: [NSString stringWithFormat: @"Index:%llu", i + skip] forRow: i + start_row];
+				[gui setKey: [NSString stringWithFormat: @"Index:%lu", i + skip] forRow: i + start_row];
 			}
 		}
 		if (i < n_functions - skip)
 		{
 			[gui setColor: [OOColor greenColor] forRow: start_row + i];
 			[gui setArray: [NSArray arrayWithObjects: DESC(@"gui-more"), @" --> ", nil] forRow: start_row + i];
-			[gui setKey: [NSString stringWithFormat: @"More:%llu", n_rows + skip] forRow: start_row + i];
+			[gui setKey: [NSString stringWithFormat: @"More:%lu", n_rows + skip] forRow: start_row + i];
 			i++;
 		}
 

src/Core/Entities/ShipEntity.m

@@ -13710,7 +13710,7 @@ - (BOOL) acceptAsEscort:(ShipEntity *) other_ship
 	//doesn't seem to have any adverse effect for now. - Kaks.
 	if ([shipAI stackDepth] > 3)
 	{
-		OOLog(@"ship.escort.reject", @"%@ rejecting escort %@ because AI stack depth is %llu.",self, other_ship, [shipAI stackDepth]);
+		OOLog(@"ship.escort.reject", @"%@ rejecting escort %@ because AI stack depth is %lu.",self, other_ship, [shipAI stackDepth]);
 		return NO;
 	}
 
@@ -13753,7 +13753,7 @@ - (BOOL) acceptAsEscort:(ShipEntity *) other_ship
 		}
 		else
 		{
-			OOLog(@"ship.escort.reject", @"%@ already got max escorts(%llu). Escort rejected: %@.", self, escortCount, other_ship);
+			OOLog(@"ship.escort.reject", @"%@ already got max escorts(%lu). Escort rejected: %@.", self, escortCount, other_ship);
 		}
 	}
 	else
@@ -14498,7 +14498,7 @@ - (void)dumpSelfState
 	OOLog(@"dumpState.shipEntity", @"Roles: %@", [self roleSet]);
 	OOLog(@"dumpState.shipEntity", @"Primary role: %@", primaryRole);
 	OOLog(@"dumpState.shipEntity", @"Script: %@", script);
-	OOLog(@"dumpState.shipEntity", @"Subentity count: %llu", [self subEntityCount]);
+	OOLog(@"dumpState.shipEntity", @"Subentity count: %lu", [self subEntityCount]);
 	OOLog(@"dumpState.shipEntity", @"Behaviour: %@", OOStringFromBehaviour(behaviour));
 	id target = [self primaryTarget];
 	if (target == nil)  target = @"<none>";

src/Core/Entities/ShipEntityScriptMethods.m

@@ -69,7 +69,7 @@ - (NSArray *) spawnShipsWithRole:(NSString *)role count:(NSUInteger)count
 
 	if (count == 0)  return [NSArray array];
 
-	OOLog(kOOLogNoteAddShips, @"Spawning %llu x '%@' near %@ %d", count, role, [self shortDescription], [self universalID]);
+	OOLog(kOOLogNoteAddShips, @"Spawning %lu x '%@' near %@ %d", count, role, [self shortDescription], [self universalID]);
 
 	result = [NSMutableArray arrayWithCapacity:count];
 

src/Core/Entities/StationEntity.m

@@ -2462,7 +2462,7 @@ - (void)dumpSelfState
 	OOLog(@"dumpState.stationEntity", @"Scavengers launched: %u", scavengers_launched);
 	OOLog(@"dumpState.stationEntity", @"Docked shuttles: %u", docked_shuttles);
 	OOLog(@"dumpState.stationEntity", @"Docked traders: %u", docked_traders);
-	OOLog(@"dumpState.stationEntity", @"Equivalent tech level: %llu", equivalentTechLevel);
+	OOLog(@"dumpState.stationEntity", @"Equivalent tech level: %lu", equivalentTechLevel);
 	OOLog(@"dumpState.stationEntity", @"Equipment price factor: %g", equipmentPriceFactor);
 
 	flags = [NSMutableArray array];
@@ -2478,7 +2478,7 @@ - (void)dumpSelfState
 	// Ships on hold list, only used with moving stations (= carriers)
 	if([_shipsOnHold count] > 0)
 	{
-		OOLog(@"dumpState.stationEntity", @"%llu Ships on hold (unsorted):", [_shipsOnHold count]);
+		OOLog(@"dumpState.stationEntity", @"%lu Ships on hold (unsorted):", [_shipsOnHold count]);
 
 		OOLogIndent();
 		NSEnumerator	*onHoldEnum = [_shipsOnHold objectEnumerator];

src/Core/Entities/WormholeEntity.m

@@ -742,9 +742,10 @@ static void DrawWormholeCorona(GLfloat inner_radius, GLfloat outer_radius, int s
 	if (outer_radius >= z_distance) // inside the sphere
 		return;
 	int i;
-
-	NSRange				activity = { 0.34, 1.0 };
-
+
+	const GLfloat activityMin = 0.34f;
+	const GLfloat activityLength = 1.0f;
+
 	GLfloat				s0, c0, s1, c1;
 
 	GLfloat				r0, r1;
@@ -765,7 +766,7 @@ static void DrawWormholeCorona(GLfloat inner_radius, GLfloat outer_radius, int s
 			rv0 = randf();
 			rv1 = randf();
 
-			q = activity.location + rv0 * activity.length;
+			q = activityMin + rv0 * activityLength;
 
 			s0 = r0 * sin(theta);
 			c0 = r0 * cos(theta);
@@ -783,7 +784,7 @@ static void DrawWormholeCorona(GLfloat inner_radius, GLfloat outer_radius, int s
 		rv0 = randf();
 		rv1 = randf();
 
-		q = activity.location + rv0 * activity.length;
+		q = activityMin + rv0 * activityLength;
 
 		s0 = 0.0f;	// r0 * sin(0);
 		c0 = r0;	// r0 * cos(0);
@@ -856,7 +857,7 @@ - (void)dumpSelfState
 	OOLog(@"dumpState.wormholeEntity", @"Scanned State          : %@", [self scanInfoString]);
 
 	OOLog(@"dumpState.wormholeEntity", @"Mass                   : %.2lf", witch_mass);
-	OOLog(@"dumpState.wormholeEntity", @"Ships                  : %llu", [shipsInTransit count]);
+	OOLog(@"dumpState.wormholeEntity", @"Ships                  : %lu", [shipsInTransit count]);
 	unsigned i;
 	for (i = 0; i < [shipsInTransit count]; ++i)
 	{

src/Core/Materials/OODefaultShaderSynthesizer.m

@@ -625,7 +625,7 @@ - (NSUInteger) assignIDForTexture:(NSDictionary *)spec
 	{
 		texID = [_texturesByName count];
 		NSNumber	*texIDObj = [NSNumber numberWithUnsignedInteger:texID];
-		NSString	*texUniform = [NSString stringWithFormat:@"uTexture%llu", texID];
+		NSString	*texUniform = [NSString stringWithFormat:@"uTexture%lu", texID];
 
 #ifndef NDEBUG
 		BOOL useInternalFormat = NO;
@@ -666,7 +666,7 @@ - (void) setUpOneTexture:(NSDictionary *)textureSpec
 	if ((NSUInteger)NSHashGet(_sampledTextures, (const void *)(texID + 1)) == 0)
 	{
 		NSHashInsertKnownAbsent(_sampledTextures, (const void *)(texID + 1));
-		[_fragmentTextureLookups appendFormat:@"\tvec4 tex%lluSample = texture2D(uTexture%llu, texCoords);  // %@\n", texID, texID, [textureSpec oo_stringForKey:kOOTextureSpecifierNameKey]];
+		[_fragmentTextureLookups appendFormat:@"\tvec4 tex%luSample = texture2D(uTexture%lu, texCoords);  // %@\n", texID, texID, [textureSpec oo_stringForKey:kOOTextureSpecifierNameKey]];
 	}
 }
 
@@ -678,7 +678,7 @@ - (void) getSampleName:(NSString **)outSampleName andSwizzleOp:(NSString **)outS
 	[self setUpOneTexture:textureSpec];
 	NSUInteger	texID = [self textureIDForSpec:textureSpec];
 
-	*outSampleName = [NSString stringWithFormat:@"tex%lluSample", texID];
+	*outSampleName = [NSString stringWithFormat:@"tex%luSample", texID];
 	*outSwizzleOp = GetExtractMode(textureSpec);
 }
 
@@ -704,7 +704,7 @@ - (NSString *) readRGBForTextureSpec:(NSDictionary *)textureSpec mapName:(NSStri
 		return [NSString stringWithFormat:@"%@.%@", sample, swizzle];
 	}
 
-	OOLogWARN(@"material.synthesis.warning.extractionMismatch", @"The %@ map for material \"%@\" of \"%@\" specifies %llu channels to extract, but only %@ may be used.", mapName, [self materialKey], [self entityName], channelCount, @"1 or 3");
+	OOLogWARN(@"material.synthesis.warning.extractionMismatch", @"The %@ map for material \"%@\" of \"%@\" specifies %lu channels to extract, but only %@ may be used.", mapName, [self materialKey], [self entityName], channelCount, @"1 or 3");
 	return nil;
 }
 
@@ -726,7 +726,7 @@ - (NSString *) readOneChannelForTextureSpec:(NSDictionary *)textureSpec mapName:
 		return [NSString stringWithFormat:@"%@.%@", sample, swizzle];
 	}
 
-	OOLogWARN(@"material.synthesis.warning.extractionMismatch", @"The %@ map for material \"%@\" of \"%@\" specifies %llu channels to extract, but only %@ may be used.", mapName, [self materialKey], [self entityName], channelCount, @"1");
+	OOLogWARN(@"material.synthesis.warning.extractionMismatch", @"The %@ map for material \"%@\" of \"%@\" specifies %lu channels to extract, but only %@ may be used.", mapName, [self materialKey], [self entityName], channelCount, @"1");
 	return nil;
 }
 
@@ -840,7 +840,7 @@ texture coordinates (duh).
 				[_fragmentPreTextures appendString:@"\t// Parallax mapping\n"];
 
 				NSUInteger texID = [self assignIDForTexture:parallaxMap];
-				[_fragmentPreTextures appendFormat:@"\tfloat parallax = texture2D(uTexture%llu, vTexCoords).%@;\n", texID, swizzle];
+				[_fragmentPreTextures appendFormat:@"\tfloat parallax = texture2D(uTexture%lu, vTexCoords).%@;\n", texID, swizzle];
 
 				if (parallaxScale != 1.0f)
 				{
@@ -857,7 +857,7 @@ texture coordinates (duh).
 			}
 			else
 			{
-				OOLogWARN(@"material.synthesis.warning.extractionMismatch", @"The %@ map for material \"%@\" of \"%@\" specifies %llu channels to extract, but only %@ may be used.", @"parallax", [self materialKey], [self entityName], channelCount, @"1");
+				OOLogWARN(@"material.synthesis.warning.extractionMismatch", @"The %@ map for material \"%@\" of \"%@\" specifies %lu channels to extract, but only %@ may be used.", @"parallax", [self materialKey], [self entityName], channelCount, @"1");
 			}
 		}
 	}
@@ -1010,7 +1010,7 @@ - (void) writeNormalIfNeeded
 		}
 		else
 		{
-			OOLogWARN(@"material.synthesis.warning.extractionMismatch", @"The %@ map for material \"%@\" of \"%@\" specifies %llu channels to extract, but only %@ may be used.", @"normal", [self materialKey], [self entityName], [swizzle length], @"3");
+			OOLogWARN(@"material.synthesis.warning.extractionMismatch", @"The %@ map for material \"%@\" of \"%@\" specifies %lu channels to extract, but only %@ may be used.", @"normal", [self materialKey], [self entityName], [swizzle length], @"3");
 		}
 	}
 	_constZNormal = YES;