diff --git a/mozilla/sun-java/stubs/include/jni_md.h b/mozilla/sun-java/stubs/include/jni_md.h
index 13582f554b0..27320c284e0 100644
--- a/mozilla/sun-java/stubs/include/jni_md.h
+++ b/mozilla/sun-java/stubs/include/jni_md.h
@@ -66,9 +66,20 @@
  ******************************************************************************/
 
 /* DLL Entry modifiers... */
-
+#if defined(XP_OS2)
+#  ifdef XP_OS2_VACPP
+#	  define JNI_PUBLIC_API(ResultType)	    ResultType _System
+#	  define JNI_PUBLIC_VAR(VarType)        VarType
+#     define JNICALL
+#     define JNIEXPORT
+#  else
+#	  define JNI_PUBLIC_API(ResultType)	    ResultType
+#	  define JNI_PUBLIC_VAR(VarType)        VarType
+#     define JNICALL
+#     define JNIEXPORT
+#  endif
 /* PC */
-#if defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
+#elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
 #	include <windows.h>
 #	if defined(_MSC_VER)
 #		if defined(WIN32) || defined(_WIN32)
diff --git a/mozilla/sun-java/stubs/include/jri_md.h b/mozilla/sun-java/stubs/include/jri_md.h
index 0013992bdb2..ae6c53a3930 100644
--- a/mozilla/sun-java/stubs/include/jri_md.h
+++ b/mozilla/sun-java/stubs/include/jri_md.h
@@ -53,7 +53,17 @@ extern "C" {
 /* DLL Entry modifiers... */
 
 /* PC */
-#if defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
+#if defined(XP_OS2)
+#  ifdef XP_OS2_VACPP
+#	  define JRI_PUBLIC_API(ResultType)	    ResultType _Optlink
+#	  define JRI_PUBLIC_VAR(VarType)        VarType
+#     define JRI_CALLBACK
+#  else
+#	  define JRI_PUBLIC_API(ResultType)	    ResultType
+#	  define JRI_PUBLIC_VAR(VarType)        VarType
+#     define JRI_CALLBACK
+#  endif
+#elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32)
 #	include <windows.h>
 #	if defined(_MSC_VER)
 #		if defined(WIN32) || defined(_WIN32)
diff --git a/mozilla/sun-java/stubs/include/sysmacros_md.h b/mozilla/sun-java/stubs/include/sysmacros_md.h
index b7dd7f7380a..a977763ce2a 100644
--- a/mozilla/sun-java/stubs/include/sysmacros_md.h
+++ b/mozilla/sun-java/stubs/include/sysmacros_md.h
@@ -22,7 +22,7 @@
 #ifndef SYSMACROS_MD_H_
 #define SYSMACROS_MD_H_
 
-#if defined(XP_PC) && !defined(_WIN32)
+#if defined (XP_PC) && !defined (_WIN32) && !defined (XP_OS2)
 #ifndef HUGEP
 #define HUGEP __huge
 #endif
@@ -30,6 +30,7 @@
 #ifndef HUGEP
 #define HUGEP
 #endif
-#endif /* defined(XP_PC) && !defined(_WIN32) */
+#endif /* defined(XP_PC) && !defined (_WIN32) && !defined (XP_OS2) */
+
 
 #endif /*SYSMACROS_MD_H_*/