From 7e23a04d4f1c6055ee5779d759875480c76aee0b Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Tue, 18 Mar 2003 22:43:16 +0000 Subject: [PATCH] Landing sun-java changes for mingw support. Bug #134113 r=beard sr=blizzard git-svn-id: svn://10.0.0.236/trunk@139706 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/sun-java/stubs/include/jni_md.h | 4 +++- mozilla/sun-java/stubs/include/jri_md.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mozilla/sun-java/stubs/include/jni_md.h b/mozilla/sun-java/stubs/include/jni_md.h index 0a0ef1de500..1277ad7b1aa 100644 --- a/mozilla/sun-java/stubs/include/jni_md.h +++ b/mozilla/sun-java/stubs/include/jni_md.h @@ -40,6 +40,8 @@ #ifndef JNI_MD_H #define JNI_MD_H +#include "prtypes.h" /* needed for _declspec */ + /******************************************************************************* * WHAT'S UP WITH THIS FILE? * @@ -94,7 +96,7 @@ /* PC */ #elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) # include -# if defined(_MSC_VER) +# if defined(_MSC_VER) || defined(__GNUC__) # if defined(WIN32) || defined(_WIN32) # define JNI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType __stdcall # define JNI_PUBLIC_VAR(VarType) VarType diff --git a/mozilla/sun-java/stubs/include/jri_md.h b/mozilla/sun-java/stubs/include/jri_md.h index a0dbd0c0d2c..f55dade8a93 100644 --- a/mozilla/sun-java/stubs/include/jri_md.h +++ b/mozilla/sun-java/stubs/include/jri_md.h @@ -43,7 +43,7 @@ #define JRI_MD_H #include -#include "prtypes.h" /* Needed for HAS_LONG_LONG ifdefs */ +#include "prtypes.h" /* Needed for HAS_LONG_LONG ifdefs & _declspec */ #ifdef __cplusplus extern "C" { @@ -81,7 +81,7 @@ extern "C" { # endif #elif defined(XP_PC) || defined(_WINDOWS) || defined(WIN32) || defined(_WIN32) # include -# if defined(_MSC_VER) +# if defined(_MSC_VER) || defined(__GNUC__) # if defined(WIN32) || defined(_WIN32) # define JRI_PUBLIC_API(ResultType) _declspec(dllexport) ResultType # define JRI_PUBLIC_VAR(VarType) VarType