Changeset 202 for trunk

Timestamp:

Dec 8, 2010, 10:01:40 PM (15 years ago)

Author:

dmik

Message:

jdk: Use fontmgr.dll instead of fontmanager.dll on OS/2 (usual 8x3 limitation).

Location:

trunk/openjdk/jdk

Files:

• make/sun/font/Makefile (modified) (1 diff)
• src/share/classes/sun/font/FontManagerNativeLibrary.java (modified) (1 diff)

trunk/openjdk/jdk/make/sun/font/Makefile

@@ -32 +32 @@
 LIBRARY = fontmanager
 PRODUCT = sun
+
+LIBRARY_SHORT = fontmgr
 
 # Indicate we want the C++ compiler to do the linking.

trunk/openjdk/jdk/src/share/classes/sun/font/FontManagerNativeLibrary.java

@@ -59 +59 @@
                    System.loadLibrary("freetype");
                }
-               System.loadLibrary("fontmanager");
+               if (System.getProperty("os.name").startsWith("OS/2")) {
+                   System.loadLibrary("fontmgr");
+               } else {
+                   System.loadLibrary("fontmanager");
+               }
 
                return null;