archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8189610: Reconcile jvm.h and all jvm_md.h between java.base and hotspot

Browse source 
Removed hotspot version of jvm*h and jni*h files.

Reviewed-by: ihse, mchung, dholmes
This commit is contained in:
Coleen Phillimore 2017-10-31 11:55:09 -04:00
parent b36ba5ff60
commit e908052a71
177 changed files with 308 additions and 2713 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/java.base/windows/native/include/jni_md.h
View file

@ -30,6 +30,7 @@
#define JNIIMPORT __declspec(dllimport)
#define JNICALL __stdcall
// 'long' is always 32 bit on windows so this matches what jdk expects
typedef long jint;
typedef __int64 jlong;
typedef signed char jbyte;

37
src/java.base/windows/native/include/jvm_md.h
View file

@ -31,13 +31,20 @@
* JNI conversion, which should be sorted out later.
*/
#include <windows.h>
#include <windef.h>
#include <winbase.h>
#include "jni.h"
typedef int socklen_t;
#define JNI_ONLOAD_SYMBOLS {"_JNI_OnLoad@8", "JNI_OnLoad"}
#define JNI_ONUNLOAD_SYMBOLS {"_JNI_OnUnload@8", "JNI_OnUnload"}
#define JVM_ONLOAD_SYMBOLS {"_JVM_OnLoad@12", "JVM_OnLoad"}
#define AGENT_ONLOAD_SYMBOLS {"_Agent_OnLoad@12", "Agent_OnLoad"}
#define AGENT_ONUNLOAD_SYMBOLS {"_Agent_OnUnload@4", "Agent_OnUnload"}
#define AGENT_ONATTACH_SYMBOLS {"_Agent_OnAttach@12", "Agent_OnAttach"}
#define JNI_LIB_PREFIX ""
#define JNI_LIB_SUFFIX ".dll"
@ -63,21 +70,16 @@ typedef struct {
#define JVM_X_OK 1
#define JVM_F_OK 0
#ifdef __cplusplus
extern "C" {
#endif
JNIEXPORT void * JNICALL
JVM_GetThreadInterruptEvent();
/*
* These routines are only reentrant on Windows
*/
JNIEXPORT struct protoent * JNICALL
JVM_GetProtoByName(char* name);
JNIEXPORT struct hostent* JNICALL
JVM_GetHostByAddr(const char* name, int len, int type);
JNIEXPORT struct hostent* JNICALL
JVM_GetHostByName(char* name);
#ifdef __cplusplus
} /* extern "C" */
#endif /* __cplusplus */
/*
* File I/O
@ -89,19 +91,12 @@ JVM_GetHostByName(char* name);
#include <errno.h>
#include <signal.h>
/* O Flags */
#define JVM_O_RDONLY O_RDONLY
#define JVM_O_WRONLY O_WRONLY
#define JVM_O_RDWR O_RDWR
#define JVM_O_O_APPEND O_APPEND
#define JVM_O_EXCL O_EXCL
#define JVM_O_CREAT O_CREAT
/* Signals */
#define JVM_SIGINT SIGINT
#define JVM_SIGTERM SIGTERM
#define SHUTDOWN1_SIGNAL SIGINT /* Shutdown Hooks support. */
#define SHUTDOWN2_SIGNAL SIGTERM
#endif /* !_JAVASOFT_JVM_MD_H_ */