# HG changeset patch
# User hseigel
# Date 1456962523 0
# Node ID 0e872dde6064a37d7c325f29364a25b49d833df2
# Parent  741c43b676d4d4950cc340dd2cd8c0cf8cd43cca# Parent  84ec2f36e3722a76ddbc7018afb3a88d3bb029de
Merge

diff -r 741c43b676d4 -r 0e872dde6064 jdk/src/java.base/share/native/include/jni.h
--- a/jdk/src/java.base/share/native/include/jni.h	Wed Mar 02 21:39:03 2016 +0100
+++ b/jdk/src/java.base/share/native/include/jni.h	Wed Mar 02 23:48:43 2016 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1952,6 +1952,7 @@
 #define JNI_VERSION_1_4 0x00010004
 #define JNI_VERSION_1_6 0x00010006
 #define JNI_VERSION_1_8 0x00010008
+#define JNI_VERSION_9   0x00090000
 
 #ifdef __cplusplus
 } /* extern "C" */