Changeset 212

Timestamp:

Dec 14, 2010, 9:01:44 PM (15 years ago)

Author:

dmik

Message:

jdk: Define proper IS_WIN32, IS_NT and friends on OS/2.

Location:

trunk/openjdk/jdk/src/windows/native/sun/windows

Files:

• UnicowsLoader.h (modified) (2 diffs)
• awt.h (modified) (1 diff)

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

@@ -64 +64 @@
 };
 
-#ifndef AWT_H
+#ifndef _AWT_H_
 // copied from awt.h
-#if defined (WIN32)
+#if defined (WIN32) || defined(__WIN32OS2__)
     #define IS_WIN32 TRUE
 #else
@@ -72 +72 @@
 #endif
 #define IS_NT      (IS_WIN32 && !(::GetVersion() & 0x80000000))
-#endif // AWT_H
+#endif // _AWT_H_
 
 // Now the platform encoding is Unicode (UTF-16), re-define JNU_ functions

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

@@ -133 +133 @@
  * uname -s returns Windows_NT on NT and 2000 and XP
  */
-#if defined (WIN32)
+#if defined (WIN32) || defined(__WIN32OS2__)
     #define IS_WIN32 TRUE
 #else