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
This commit is contained in:
@@ -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 <windows.h>
|
||||
# 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
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
#define JRI_MD_H
|
||||
|
||||
#include <assert.h>
|
||||
#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 <windows.h>
|
||||
# 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
|
||||
|
||||
Reference in New Issue
Block a user