8264047: Duplicate global variable 'jvm' in libjavajpeg and libawt

Backport-of: eb6330e4f0366878e7ec8a606ddc717622cbdaea

Author: jerboaa

src/java.desktop/share/native/libjavajpeg/imageioJPEG.c

@@ -85,7 +85,7 @@ static jfieldID JPEGHuffmanTable_valuesID;
 /*
  * Defined in jpegdecoder.c. Copy code from there if and
  * when that disappears. */
-externJavaVM*jvm;
+externJavaVM*the_jvm;
 
 /*
  * The following sets of defines must match the warning messages in the
@@ -557,7 +557,7 @@ sun_jpeg_output_message (j_common_ptr cinfo)
 charbuffer[JMSG_LENGTH_MAX];
 jstringstring;
 imageIODataPtrdata= (imageIODataPtr) cinfo->client_data;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 jobjecttheObject;
 
 /* Create the message */
@@ -928,7 +928,7 @@ imageio_fill_input_buffer(j_decompress_ptr cinfo)
 structjpeg_source_mgr*src=cinfo->src;
 imageIODataPtrdata= (imageIODataPtr) cinfo->client_data;
 streamBufferPtrsb=&data->streamBuf;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 intret;
 jobjectinput=NULL;
 
@@ -1021,7 +1021,7 @@ imageio_fill_suspended_buffer(j_decompress_ptr cinfo)
 structjpeg_source_mgr*src=cinfo->src;
 imageIODataPtrdata= (imageIODataPtr) cinfo->client_data;
 streamBufferPtrsb=&data->streamBuf;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 jintret;
 size_toffset, buflen;
 jobjectinput=NULL;
@@ -1122,7 +1122,7 @@ imageio_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
 structjpeg_source_mgr*src=cinfo->src;
 imageIODataPtrdata= (imageIODataPtr) cinfo->client_data;
 streamBufferPtrsb=&data->streamBuf;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 jlongret;
 jobjectreader;
 jobjectinput=NULL;
@@ -1207,7 +1207,7 @@ imageio_term_source(j_decompress_ptr cinfo)
 // To pushback, just seek back by src->bytes_in_buffer
 structjpeg_source_mgr*src=cinfo->src;
 imageIODataPtrdata= (imageIODataPtr) cinfo->client_data;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 jobjectreader=data->imageIOobj;
 if (src->bytes_in_buffer>0) {
 RELEASE_ARRAYS(env, data, src->next_input_byte);
@@ -2369,7 +2369,7 @@ imageio_init_destination (j_compress_ptr cinfo)
 structjpeg_destination_mgr*dest=cinfo->dest;
 imageIODataPtrdata= (imageIODataPtr) cinfo->client_data;
 streamBufferPtrsb=&data->streamBuf;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 
 if (sb->buf==NULL) {
 // We forgot to pin the array
@@ -2395,7 +2395,7 @@ imageio_empty_output_buffer (j_compress_ptr cinfo)
 structjpeg_destination_mgr*dest=cinfo->dest;
 imageIODataPtrdata= (imageIODataPtr) cinfo->client_data;
 streamBufferPtrsb=&data->streamBuf;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 jobjectoutput=NULL;
 
 RELEASE_ARRAYS(env, data, (constJOCTET*)(dest->next_output_byte));
@@ -2431,7 +2431,7 @@ imageio_term_destination (j_compress_ptr cinfo)
 structjpeg_destination_mgr*dest=cinfo->dest;
 imageIODataPtrdata= (imageIODataPtr) cinfo->client_data;
 streamBufferPtrsb=&data->streamBuf;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 
 /* find out how much needs to be written */
 /* this conversion from size_t to jint is safe, because the lenght of the buffer is limited by jint */

src/java.desktop/share/native/libjavajpeg/jpegdecoder.c

@@ -64,12 +64,12 @@ static jmethodID InputStream_availableID;
 
 /* Initialize the Java VM instance variable when the library is
  first loaded */
-JavaVM*jvm;
+JavaVM*the_jvm;
 
 JNIEXPORTjintJNICALL
 DEF_JNI_OnLoad(JavaVM*vm, void*reserved)
 {
-jvm=vm;
+the_jvm=vm;
 returnJNI_VERSION_1_2;
 }
 
@@ -284,7 +284,7 @@ GLOBAL(boolean)
 sun_jpeg_fill_input_buffer(j_decompress_ptrcinfo)
 {
 sun_jpeg_source_ptrsrc= (sun_jpeg_source_ptr) cinfo->src;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 intret, buflen;
 
 if (src->suspendable) {
@@ -327,7 +327,7 @@ GLOBAL(void)
 sun_jpeg_fill_suspended_buffer(j_decompress_ptrcinfo)
 {
 sun_jpeg_source_ptrsrc= (sun_jpeg_source_ptr) cinfo->src;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 size_toffset, buflen;
 intret;
 
@@ -397,7 +397,7 @@ GLOBAL(void)
 sun_jpeg_skip_input_data(j_decompress_ptrcinfo, longnum_bytes)
 {
 sun_jpeg_source_ptrsrc= (sun_jpeg_source_ptr) cinfo->src;
-JNIEnv*env= (JNIEnv*)JNU_GetEnv(jvm, JNI_VERSION_1_2);
+JNIEnv*env= (JNIEnv*)JNU_GetEnv(the_jvm, JNI_VERSION_1_2);
 intret;
 intbuflen;