diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-11-13 00:29:48 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-11-13 00:29:48 +0000 |
| commit | 2a2b91f336fe4f6c2a314db2bc4cdffff6cf5a61 (patch) | |
| tree | 21df1df36e4070dbe32198f06ea33964e82a998b /native/jni/java-nio/gnu_java_nio_VMChannel.c | |
| parent | 237bdd93058f891ae4567cf4e051c5831bd4646b (diff) | |
| download | classpath-2a2b91f336fe4f6c2a314db2bc4cdffff6cf5a61.tar.gz | |
2006-11-13 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics from 2006/11/04-2006/11/12.
Diffstat (limited to 'native/jni/java-nio/gnu_java_nio_VMChannel.c')
| -rw-r--r-- | native/jni/java-nio/gnu_java_nio_VMChannel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/native/jni/java-nio/gnu_java_nio_VMChannel.c b/native/jni/java-nio/gnu_java_nio_VMChannel.c index 33a4f66de..c49a3184f 100644 --- a/native/jni/java-nio/gnu_java_nio_VMChannel.c +++ b/native/jni/java-nio/gnu_java_nio_VMChannel.c @@ -1272,7 +1272,7 @@ Java_gnu_java_nio_VMChannel_getsockname (JNIEnv *env, jclass clazz __attribute__ { addr6 = (struct sockaddr_in6 *) sockaddr; memcpy (nameptr, &(addr6->sin6_addr.s6_addr), 16); - memcpy (nameptr, &(addr6->sin6_port), 2); + memcpy (nameptr + 16, &(addr6->sin6_port), 2); return 16; } #endif /* HAVE_INET6 */ @@ -1331,7 +1331,7 @@ Java_gnu_java_nio_VMChannel_getpeername (JNIEnv *env, jclass clazz __attribute__ { addr6 = (struct sockaddr_in6 *) sockaddr; memcpy (nameptr, &(addr6->sin6_addr.s6_addr), 16); - memcpy (nameptr, &(addr6->sin6_port), 2); + memcpy (nameptr + 16, &(addr6->sin6_port), 2); return 16; } #endif /* HAVE_INET6 */ |