Changeset 208 for trunk/openjdk/jdk/src/share

Timestamp:

Dec 10, 2010, 5:58:20 PM (15 years ago)

Author:

dmik

Message:

jdk: Made build splashscreen.dll, jpeg.dll, lcms.dll.

Location:

trunk/openjdk/jdk/src/share

Files:

• classes/java/awt/SplashScreen.java (modified) (1 diff)
• native/sun/awt/image/jpeg/jmorecfg.h (modified) (2 diffs)
• native/sun/java2d/cmm/lcms/LCMS.c (modified) (2 diffs)
• native/sun/java2d/cmm/lcms/lcms.h (modified) (3 diffs)

trunk/openjdk/jdk/src/share/classes/java/awt/SplashScreen.java

@@ -109 +109 @@
             // SplashScreen class is now a singleton
             if (!wasClosed && theInstance == null) {
-                java.security.AccessController.doPrivileged(
+                if (System.getProperty("os.name").startsWith("OS/2")) {
+                    java.security.AccessController.doPrivileged(
+                        new sun.security.action.LoadLibraryAction("splshscr"));
+                } else {
+                    java.security.AccessController.doPrivileged(
                         new sun.security.action.LoadLibraryAction("splashscreen"));
+                }
                 long ptr = _getInstance();
                 if (ptr != 0 && _isVisible(ptr)) {

trunk/openjdk/jdk/src/share/native/sun/awt/image/jpeg/jmorecfg.h

@@ -127 +127 @@
 
 
+#if !defined(__WIN32OS2__) || !defined(__WINE_BASETSD_H)
+
 /* These typedefs are used for various table entries and so forth.
  * They must be at least as wide as specified; but making them too big
@@ -169 +171 @@
 #endif
 #endif
+
+#endif /* !defined(__WIN32OS2__) || !defined(__WINE_BASETSD_H) */
 
 /* Datatype used for image dimensions.  The JPEG standard only supports

trunk/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c

@@ -120 +120 @@
 }
 
-JNIEXPORT int JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *jvm, void *reserved) {
     javaVM = jvm;
 
@@ -457 +457 @@
 {
     storeID_t sTrans;
-    int size, inFmt, outFmt, srcDType, dstDType, outSize, renderType;
+    int size, inFmt, outFmt, outSize, renderType;
+    jint srcDType, dstDType;
     int srcOffset, srcNextRowOffset, dstOffset, dstNextRowOffset;
     int width, height, i;

trunk/openjdk/jdk/src/share/native/sun/java2d/cmm/lcms/lcms.h

@@ -117 +117 @@
 #endif
 
+#ifdef __WIN32OS2__
+#    undef NON_WINDOWS
+#endif
+
 // Borland C
 
@@ -263 +267 @@
 #include <windows.h>
 
-#ifdef _WIN64
+#if defined(__WIN32OS2__)
+#   include <string.h>
+#endif
+
+#if defined(_WIN64) || defined(__WIN32OS2__)
 # ifdef USE_ASSEMBLER
 #    undef  USE_ASSEMBLER
@@ -277 +285 @@
 #endif
 
+#ifndef __GNUC__
 // This works for both VC & BorlandC
 #define LCMS_INLINE __inline
+#else
+#define LCMS_INLINE static inline
+#endif
 
 #ifdef USE_PTHREADS