Commit c591e04a authored Mar 18, 2003 by cls%seawood.org

Landing sun-java changes for mingw support.

Bug #134113 r=beard sr=blizzard

parent 1e1669a8

sun-java/stubs/include/jni_md.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -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

sun-java/stubs/include/jri_md.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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