[cp-patches] Patch gnu_java_net_PlainSocketImpl.c: replace this -> obj

[Dr. Torsten Rupp]

Dear List-members,

2004-11-03  Torsten Rupp  address@hidden

        * gnu_java_net_PlainSocketImpl.c: Replaced all this by obj to make
        source compatible with C++ compilers


Sincerely,

Torsten Rupp

--- gnu_java_net_PlainSocketImpl.c.old  Wed Nov  3 11:05:39 2004
+++ gnu_java_net_PlainSocketImpl.c      Wed Nov  3 11:28:33 2004
@@ -68,13 +68,13 @@
  * Creates a new stream or datagram socket
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_PlainSocketImpl_create(JNIEnv *env, jobject this, jboolean 
stream)
+Java_gnu_java_net_PlainSocketImpl_create(JNIEnv *env, jobject obj, jboolean 
stream)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  _javanet_create(env, this, stream);
+  _javanet_create(env, obj, stream);
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
@@ -86,13 +86,13 @@
  * action as well.
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_PlainSocketImpl_close(JNIEnv *env, jobject this)
+Java_gnu_java_net_PlainSocketImpl_close(JNIEnv *env, jobject obj)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  _javanet_close(env, this, 1);
+  _javanet_close(env, obj, 1);
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
@@ -103,14 +103,14 @@
  * Connects to the specified destination.
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_PlainSocketImpl_connect(JNIEnv *env, jobject this, 
+Java_gnu_java_net_PlainSocketImpl_connect(JNIEnv *env, jobject obj, 
                                       jobject addr, jint port)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  _javanet_connect(env, this, addr, port);
+  _javanet_connect(env, obj, addr, port);
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
@@ -123,14 +123,14 @@
  * variables. 
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_PlainSocketImpl_bind(JNIEnv *env, jobject this, jobject addr,
+Java_gnu_java_net_PlainSocketImpl_bind(JNIEnv *env, jobject obj, jobject addr,
                                    jint port)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  _javanet_bind(env, this, addr, port, 1);
+  _javanet_bind(env, obj, addr, port, 1);
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
@@ -142,13 +142,13 @@
  * connections allowed.
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_PlainSocketImpl_listen(JNIEnv *env, jobject this, jint 
queuelen)
+Java_gnu_java_net_PlainSocketImpl_listen(JNIEnv *env, jobject obj, jint 
queuelen)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  _javanet_listen(env, this, queuelen);
+  _javanet_listen(env, obj, queuelen);
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
@@ -160,13 +160,13 @@
  * object. Note that we assume this is a PlainSocketImpl just like us.
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_PlainSocketImpl_accept(JNIEnv *env, jobject this, jobject 
impl)
+Java_gnu_java_net_PlainSocketImpl_accept(JNIEnv *env, jobject obj, jobject 
impl)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  _javanet_accept(env, this, impl);
+  _javanet_accept(env, obj, impl);
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
@@ -174,7 +174,7 @@
 /*************************************************************************/
 
 JNIEXPORT jint JNICALL
-Java_gnu_java_net_PlainSocketImpl_available(JNIEnv *env, jobject this)
+Java_gnu_java_net_PlainSocketImpl_available(JNIEnv *env, jobject obj)
 {
 #ifndef WITHOUT_NETWORK
   jclass   cls;
@@ -186,7 +186,7 @@
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  cls = (*env)->GetObjectClass(env, this);
+  cls = (*env)->GetObjectClass(env, obj);
   if (cls == 0)
     {
       JCL_ThrowException(env, IO_EXCEPTION, "internal error");
@@ -200,7 +200,7 @@
       return 0;
     }
 
-  fd = (*env)->GetIntField(env, this, fid);
+  fd = (*env)->GetIntField(env, obj, fid);
   
   TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE(fd,bytesAvailable,result);
   if (result != TARGET_NATIVE_OK)
@@ -220,14 +220,14 @@
  * This method sets the specified option for a socket
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_PlainSocketImpl_setOption(JNIEnv *env, jobject this, 
+Java_gnu_java_net_PlainSocketImpl_setOption(JNIEnv *env, jobject obj, 
                                         jint option_id, jobject val)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  _javanet_set_option(env, this, option_id, val);
+  _javanet_set_option(env, obj, option_id, val);
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
@@ -238,14 +238,14 @@
  * This method sets the specified option for a socket
  */
 JNIEXPORT jobject JNICALL
-Java_gnu_java_net_PlainSocketImpl_getOption(JNIEnv *env, jobject this, 
+Java_gnu_java_net_PlainSocketImpl_getOption(JNIEnv *env, jobject obj, 
                                         jint option_id)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  return(_javanet_get_option(env, this, option_id));
+  return(_javanet_get_option(env, obj, option_id));
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
@@ -256,14 +256,14 @@
  * Reads a buffer from a remote host
  */
 JNIEXPORT jint JNICALL
-Java_gnu_java_net_PlainSocketImpl_read(JNIEnv *env, jobject this, jarray buf,
+Java_gnu_java_net_PlainSocketImpl_read(JNIEnv *env, jobject obj, jarray buf,
                                    jint offset, jint len)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  return(_javanet_recvfrom(env, this, buf, offset, len, 0, 0));
+  return(_javanet_recvfrom(env, obj, buf, offset, len, 0, 0));
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
@@ -274,16 +274,17 @@
  * Writes a buffer to the remote host
  */
 JNIEXPORT void JNICALL
-Java_gnu_java_net_PlainSocketImpl_write(JNIEnv *env, jobject this, jarray buf,
+Java_gnu_java_net_PlainSocketImpl_write(JNIEnv *env, jobject obj, jarray buf,
                                     jint offset, jint len)
 {
 #ifndef WITHOUT_NETWORK
   assert(env!=NULL);
   assert((*env)!=NULL);
 
-  _javanet_sendto(env, this, buf, offset, len, 0, 0);
+  _javanet_sendto(env, obj, buf, offset, len, 0, 0);
 #else /* not WITHOUT_NETWORK */
 #endif /* not WITHOUT_NETWORK */
 }
 
 /* end of file */
+