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

[Mark Wielaard]

Hi Torsten,

On Wed, 2004-11-03 at 11:58, Dr. Torsten Rupp wrote:
> 2004-11-03  Torsten Rupp  address@hidden
> 
>       * gnu_java_net_PlainSocketImpl.c: Replaced all this by obj to make
>       source compatible with C++ compilers

Thanks. I wanted to apply this, but it seems to have been generated as a
patch to some old version.

________________________________________________________________________
> --- 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 */

The code in CVS has this hunk of code as:

/*
 * Creates a new stream or datagram socket
 */
JNIEXPORT void JNICALL
Java_gnu_java_net_PlainSocketImpl_create(JNIEnv *env, jobject this,
jboolean stream)
{
#ifndef WITHOUT_NETWORK
  assert(env!=NULL);
  assert((*env)!=NULL);

  _javanet_create(env, this, stream);
#else /* not WITHOUT_NETWORK */
#endif /* not WITHOUT_NETWORK */
}

Note that your version has the asserts() in the wrong place.
Could you please regenerate the patch against CVS?
(I don't mind to remove the asserts here at all, but that is a different
story.)

Thanks,

Mark

signature.asc
Description: This is a digitally signed message part