Index: /trunk/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h
===================================================================
--- /trunk/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h	(revision 180)
+++ /trunk/openjdk/jdk/src/share/native/sun/awt/medialib/mlib_types.h	(revision 181)
@@ -63,4 +63,7 @@
 #include <stdint.h>                     /* for uintptr_t */
 #include <malloc.h>                     /* for ptrdiff_t */
+#elif defined(OS2)
+#include <sys/types.h>                  /* for uintptr_t */
+#include <stddef.h>                     /* for ptrdiff_t */
 #else
 #include <link.h>                       /* for uintptr_t */
Index: /trunk/openjdk/jdk/src/share/native/sun/java2d/opengl/J2D_GL/gl.h
===================================================================
--- /trunk/openjdk/jdk/src/share/native/sun/java2d/opengl/J2D_GL/gl.h	(revision 180)
+++ /trunk/openjdk/jdk/src/share/native/sun/java2d/opengl/J2D_GL/gl.h	(revision 181)
@@ -105,5 +105,5 @@
  * glut.h or gl.h.
  */
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
+#if (defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)) || defined(__WIN32OS2__)
 #define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
Index: /trunk/openjdk/jdk/src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h	(revision 181)
@@ -58,5 +58,5 @@
 */
 
-#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)
+#if (defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__)) || defined(__WIN32OS2__)
 #define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
Index: /trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/RegistryKey.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/RegistryKey.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/RegistryKey.h	(revision 181)
@@ -70,3 +70,3 @@
 };
 
-#endif REGISTRYKEY_H
+#endif // REGISTRYKEY_H
Index: /trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/Win32SurfaceData.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/Win32SurfaceData.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/Win32SurfaceData.h	(revision 181)
@@ -301,3 +301,3 @@
 
 
-#endif _WIN32SURFACEDATA_H_
+#endif // _WIN32SURFACEDATA_H_
Index: /trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/dxCapabilities.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/dxCapabilities.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/java2d/windows/dxCapabilities.h	(revision 181)
@@ -65,3 +65,3 @@
 };
 
-#endif DX_CAPABILITIES_H
+#endif // DX_CAPABILITIES_H
Index: /trunk/openjdk/jdk/src/windows/native/sun/windows/Devices.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/windows/Devices.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/windows/Devices.h	(revision 181)
@@ -55,5 +55,5 @@
            InstanceAccess* operator&();
        };
-friend                          InstanceAccess;
+friend class                    InstanceAccess;
 
 private:
@@ -71,3 +71,3 @@
 };
 
-#endif _DEVICES_H_
+#endif // _DEVICES_H_
Index: /trunk/openjdk/jdk/src/windows/native/sun/windows/alloc.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/windows/alloc.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/windows/alloc.h	(revision 181)
@@ -38,4 +38,5 @@
 class awt_toolkit_shutdown {};
 
+#ifndef __WIN32OS2__
 // Disable "C++ Exception Specification ignored" warnings.
 // These warnings are generated because VC++ 5.0 allows, but does not enforce,
@@ -43,4 +44,5 @@
 // is updated to enforce exception specifications.
 #pragma warning(disable : 4290)
+#endif
 
 #ifdef TRY
Index: /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Component.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Component.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Component.h	(revision 181)
@@ -448,5 +448,5 @@
     static void JavaKeyToWindowsKey(UINT javaKey, UINT *windowsKey, UINT *modifiers, UINT originalWindowsKey);
 
-    INLINE static void AwtComponent::JavaKeyToWindowsKey(UINT javaKey,
+    INLINE static void JavaKeyToWindowsKey(UINT javaKey,
                                        UINT *windowsKey, UINT *modifiers)
     {
Index: /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Debug.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Debug.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Debug.h	(revision 181)
@@ -69,4 +69,7 @@
 
     /* Disable inlining. */
+    #ifdef INLINE
+    #undef INLINE
+    #endif
     #define INLINE
 #else
@@ -84,4 +87,7 @@
 
     /* Enable inlining. */
+    #ifdef INLINE
+    #undef INLINE
+    #endif
     #define INLINE inline
 #endif // DEBUG
Index: /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_MenuItem.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_MenuItem.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_MenuItem.h	(revision 181)
@@ -79,5 +79,5 @@
     virtual LPCTSTR GetClassName();
 
-    void AwtMenuItem::LinkObjects(jobject peer);
+    void LinkObjects(jobject peer);
     static AwtMenuItem* Create(jobject self, jobject menu);
 
Index: /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Palette.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Palette.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Palette.h	(revision 181)
@@ -108,3 +108,3 @@
 
 
-#endif AWT_PALETTE_H
+#endif // AWT_PALETTE_H
Index: /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_PrintDialog.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_PrintDialog.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_PrintDialog.h	(revision 181)
@@ -36,8 +36,8 @@
 class AwtPrintDialog {
 public:
-    static jfieldID AwtPrintDialog::controlID;
-    static jfieldID AwtPrintDialog::parentID;
-    static jfieldID AwtPrintDialog::pageID;
-    static jmethodID AwtPrintDialog::setHWndMID;
+    static jfieldID controlID;
+    static jfieldID parentID;
+    static jfieldID pageID;
+    static jmethodID setHWndMID;
 
     static BOOL PrintDlg(LPPRINTDLG);
Index: /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Toolkit.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Toolkit.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Toolkit.h	(revision 181)
@@ -107,5 +107,5 @@
         const CriticalSection& critSec;
     };
-    friend Lock;
+    friend class Lock;
 
   private:
Index: /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h
===================================================================
--- /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h	(revision 180)
+++ /trunk/openjdk/jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h	(revision 181)
@@ -116,3 +116,3 @@
 };
 
-#endif AWT_WIN32GRAPHICSDEVICE_H
+#endif // AWT_WIN32GRAPHICSDEVICE_H
