fix merge mixhaps

src/context/common.ml

@@ -925,12 +925,19 @@ let update_platform_config com =
 
 let init_platform com =
 	let name = platform_name com.platform in
-	if (com.platform = Flash) && Path.file_extension com.file = "swc" then define com Define.Swc;
+	begin match com.platform with
+	| Flash when Path.file_extension com.file = "swc" ->
+		define com Define.Swc
+	| Jvm ->
+		raw_define com "java"
+	| _ ->
+		()
+	end;
 	(* Set the source header, unless the user has set one already or the platform sets a custom one *)
 	if not (defined com Define.SourceHeader) && (com.platform <> Hl) then
 		define_value com Define.SourceHeader ("Generated by Haxe " ^ s_version_full);
 	let forbid acc p = if p = name || PMap.mem p acc then acc else PMap.add p Forbidden acc in
-	com.package_rules <- List.fold_left forbid com.package_rules ("jvm" :: (List.map platform_name platforms));
+	com.package_rules <- List.fold_left forbid com.package_rules ("java" :: (List.map platform_name platforms));
 	update_platform_config com;
 	if com.config.pf_static then begin
 		raw_define com "target.static";
@@ -1248,7 +1255,7 @@ let dump_path com =
 	Define.defined_value_safe ~default:"dump" com.defines Define.DumpPath
 
 let adapt_defines_to_macro_context defines =
-	let to_remove = List.map Globals.platform_name Globals.platforms in
+	let to_remove = "java" :: List.map Globals.platform_name Globals.platforms in
 	let to_remove = List.fold_left (fun acc d -> Define.get_define_key d :: acc) to_remove [Define.NoTraces] in
 	let to_remove = List.fold_left (fun acc (_, d) -> ("flash" ^ d) :: acc) to_remove flash_versions in
 	let macro_defines = {