--- a/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Mon Apr 16 20:12:20 2012 +0100
+++ b/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java Mon Apr 16 18:09:53 2012 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1280,7 +1280,7 @@
String osName = AccessController.doPrivileged(
new GetPropertyAction("os.name"));
if ("SunOS".equals(osName) || "Linux".equals(osName)
- || osName.startsWith("Mac OS")) {
+ || osName.contains("OS X")) {
charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
new String[] {
"COMPOUND_TEXT", // JDK historical