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

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/windows/native/sun/awt/splashscreen

Files:

• splashscreen_config.h (modified) (1 diff)
• splashscreen_sys.c (modified) (2 diffs)

trunk/openjdk/jdk/src/windows/native/sun/awt/splashscreen/splashscreen_config.h

@@ -53 +53 @@
 #define RECT_INC_HEIGHT(r) (r).bottom++;
 
+#ifndef INLINE
 #define INLINE __inline
+#endif
 
 #define SPLASHEXPORT __declspec(dllexport)

trunk/openjdk/jdk/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c

@@ -29 +29 @@
 #include <winuser.h>
 
+#ifdef __EMX__
+#include <alloca.h>
+#endif
+
 /* layered windows api prototypes. wouldn't be needed if we could use an updated version of the MS PSDK. */
 
@@ -68 +72 @@
 #define GWLP_USERDATA GWL_USERDATA
 #define GWLP_WNDPROC  GWL_WNDPROC
+#if !defined(__WIN32OS2__)
 typedef __int32 LONG_PTR;
 typedef unsigned __int32 ULONG_PTR;
+#endif
 #endif // __int3264