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

Timestamp:

Nov 24, 2010, 5:39:00 PM (15 years ago)

Author:

dmik

Message:

jdk: Building awt in progress.

Location:

trunk/openjdk/jdk/src/windows/native

Files:

• common/gdefs_md.h (modified) (2 diffs)
• sun/java2d/j2d_md.h (modified) (1 diff)
• sun/windows/UnicowsLoader.h (modified) (1 diff)

trunk/openjdk/jdk/src/windows/native/common/gdefs_md.h

@@ -29 +29 @@
 
 #include <stddef.h>
+#ifndef __WIN32OS2__
 #ifndef _WIN64
 typedef int intptr_t;
@@ -34 +35 @@
 typedef unsigned long DWORD_PTR, *PDWORD_PTR;
 #endif
+#endif

trunk/openjdk/jdk/src/windows/native/sun/java2d/j2d_md.h

@@ -40 +40 @@
 typedef unsigned long   juint;
 
+#ifdef __WIN32OS2__
+#include <sys/types.h> /* intptr_t */
+#endif
 
 #endif /* j2d_md_h_Included */

trunk/openjdk/jdk/src/windows/native/sun/windows/UnicowsLoader.h

@@ -27 +27 @@
 #define UNICOWSLOADER_H
 
+#ifndef __WIN32OS2__
 #if !defined(UNICODE) || !defined(_UNICODE)
 #error UnicowsLoader module needs UNICODE and _UNICODE flags to be set on compiling
+#endif
 #endif