@@ -195,39 +195,48 @@
 			ctx->length_modifier = LENGTH_MODIFIER_L;
 		}
 
 		break;
 	case 'j':
-#ifndef _WIN32
-		if (!append_subformat(ctx, ctx->format + ctx->i, 1))
+#if defined(_WIN32)
+		if (!append_subformat(ctx, "I64", 3))
+			return false;
+#elif defined(__wii__)
+		if (!append_subformat(ctx, "ll", 2))
 			return false;
 #else
-		if (!append_subformat(ctx, "I64", 3))
+		if (!append_subformat(ctx, ctx->format + ctx->i, 1))
 			return false;
 #endif
 
 		ctx->length_modifier = LENGTH_MODIFIER_J;
 
 		break;
 	case 'z':
-#ifndef _WIN32
-		if (!append_subformat(ctx, ctx->format + ctx->i, 1))
+#if defined(_WIN32)
+		if (!append_subformat(ctx, "I", 1))
+			return false;
+#elif defined(__wii__)
+		if (!append_subformat(ctx, "l", 1))
 			return false;
 #else
-		if (!append_subformat(ctx, "I", 1))
+		if (!append_subformat(ctx, ctx->format + ctx->i, 1))
 			return false;
 #endif
 
 		ctx->length_modifier = LENGTH_MODIFIER_Z;
 
 		break;
 	case 't':
-#ifndef _WIN32
-		if (!append_subformat(ctx, ctx->format + ctx->i, 1))
+#if defined(_WIN32)
+		if (!append_subformat(ctx, "I", 1))
+			return false;
+#elif defined(__wii__)
+		if (!append_subformat(ctx, "l", 1))
 			return false;
 #else
-		if (!append_subformat(ctx, "I", 1))
+		if (!append_subformat(ctx, ctx->format + ctx->i, 1))
 			return false;
 #endif
 
 		ctx->length_modifier = LENGTH_MODIFIER_T;