Author: markt Date: Thu Nov 2 21:29:01 2017 New Revision: 1814110 URL: http://svn.apache.org/viewvc?rev=1814110&view=rev Log: Simplify based on minimum Java version of Java 6
Modified: commons/proper/daemon/trunk/src/native/windows/src/javajni.c Modified: commons/proper/daemon/trunk/src/native/windows/src/javajni.c URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/windows/src/javajni.c?rev=1814110&r1=1814109&r2=1814110&view=diff ============================================================================== --- commons/proper/daemon/trunk/src/native/windows/src/javajni.c (original) +++ commons/proper/daemon/trunk/src/native/windows/src/javajni.c Thu Nov 2 21:29:01 2017 @@ -21,17 +21,13 @@ #include <jni.h> -#ifndef JNI_VERSION_1_2 +#ifndef JNI_VERSION_1_6 #error ------------------------------------------------------- -#error JAVA 1.1 IS NO LONGER SUPPORTED +#error JAVA 5 AND EARLIER ARE NO LONGER SUPPORTED #error ------------------------------------------------------- #endif -#ifdef JNI_VERSION_1_4 -#define JNI_VERSION_DEFAULT JNI_VERSION_1_4 -#else -#define JNI_VERSION_DEFAULT JNI_VERSION_1_2 -#endif +#define JNI_VERSION_DEFAULT JNI_VERSION_1_6 /* Standard jvm.dll prototypes * since only single jvm can exist per process