Merge pull request #133 from irfman12/java11

Added Java11 Fixes by ggmuelle

Makefile

@@ -2,7 +2,7 @@ all:
 	echo "Please specify a system: windows wine linux osx"
 	gradle build
 windows:
-	make -C .\src\main\c windowsLocal
+	mingw32-make -C .\src\main\c windowsLocal
 	gradle build
 wine:
 	make -C src/main/c windows

README.md

@@ -97,6 +97,8 @@ After the native code is built, the JAR is rebuilt.
 
 You'll need some installation of GCC. We recommend the
 [TDM-GCC](http://tdm-gcc.tdragon.net/) distribution of mingw64-w64.
+To get the build working you need both mingw32, and ming64 installed in separate directories.
+Please modify JDKDIR to your installation of jdk.
 
 ## Building on OS X
 

src/main/c/include/SerialImp.h

@@ -472,7 +472,7 @@ int translate_parity( JNIEnv *, tcflag_t *, jint );
 void system_wait();
 void finalize_event_info_struct( struct event_info_struct * );
 int read_byte_array( JNIEnv *, jobject *, int, unsigned char *, int, int );
-long get_java_var_long( JNIEnv *, jobject, char *, char * );
+size_t get_java_var_long( JNIEnv *, jobject, char *, char * );
 size_t get_java_var( JNIEnv *, jobject, char *, char * );
 jboolean is_interrupted( struct event_info_struct * );
 int send_event(struct event_info_struct *, jint, int );

src/main/c/src/SerialImp.c

@@ -5075,9 +5075,9 @@ size_t get_java_var( JNIEnv *env, jobject jobj, char *id, char *type ) {
   return (size_t) get_java_var_long( env, jobj, id, type );
 }
 
-long get_java_var_long( JNIEnv *env, jobject jobj, char *id, char *type )
+size_t get_java_var_long( JNIEnv *env, jobject jobj, char *id, char *type )
 {
-	long result = 0;
+	size_t result = 0;
 	jclass jclazz = (*env)->GetObjectClass( env, jobj );
 	jfieldID jfd = (*env)->GetFieldID( env, jclazz, id, type );
 
@@ -5092,7 +5092,7 @@ long get_java_var_long( JNIEnv *env, jobject jobj, char *id, char *type )
 		return result;
 	}
 	if ( !strcmp( type, "J" ) ) {
-	  result = (long)( (*env)->GetLongField( env, jobj, jfd ) );
+	  result = (size_t)( (*env)->GetLongField( env, jobj, jfd ) );
 	} else {
 	  result = (size_t) ( (*env)->GetIntField( env, jobj, jfd ) );
 	}