From: stefan Date: Sat, 10 Jul 2004 16:44:08 +0000 (+0000) Subject: updated native headers X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=2ffc672c4b49b5a45d0ddaea3a2abeb591788e8d;p=cacao.git updated native headers --- diff --git a/nat/gnu_java_nio_SelectorImpl.h b/nat/gnu_java_nio_SelectorImpl.h index 0a338a24c..b1bfb5d9e 100644 --- a/nat/gnu_java_nio_SelectorImpl.h +++ b/nat/gnu_java_nio_SelectorImpl.h @@ -9,6 +9,7 @@ typedef struct gnu_java_nio_SelectorImpl { java_objectheader header; s4 closed; struct java_nio_channels_spi_SelectorProvider* provider; + struct java_util_HashSet* cancelledKeys; struct java_util_Set* keys; struct java_util_Set* selected; struct java_lang_Object* selectThreadMutex; diff --git a/nat/gnu_java_nio_channels_FileChannelImpl.h b/nat/gnu_java_nio_channels_FileChannelImpl.h index 8a4d35765..f595d213f 100644 --- a/nat/gnu_java_nio_channels_FileChannelImpl.h +++ b/nat/gnu_java_nio_channels_FileChannelImpl.h @@ -7,7 +7,7 @@ typedef struct gnu_java_nio_channels_FileChannelImpl { java_objectheader header; - s4 opened; + s4 closed; s4 fd; s4 mode; } gnu_java_nio_channels_FileChannelImpl; diff --git a/nat/java_lang_VMString.h b/nat/java_lang_VMString.h index 3e84d4849..af1a2393a 100644 --- a/nat/java_lang_VMString.h +++ b/nat/java_lang_VMString.h @@ -9,5 +9,13 @@ typedef struct java_lang_VMString { java_objectheader header; } java_lang_VMString; + +/* + * Class: java/lang/VMString + * Method: intern + * Signature: (Ljava/lang/String;)Ljava/lang/String; + */ +JNIEXPORT struct java_lang_String* JNICALL Java_java_lang_VMString_intern(JNIEnv *env, jclass clazz, struct java_lang_String* par1); + #endif diff --git a/nat/java_net_DatagramPacket.h b/nat/java_net_DatagramPacket.h index ce1cb7a55..ee9d81389 100644 --- a/nat/java_net_DatagramPacket.h +++ b/nat/java_net_DatagramPacket.h @@ -10,6 +10,7 @@ typedef struct java_net_DatagramPacket { java_bytearray* buffer; s4 offset; s4 length; + s4 maxlen; struct java_net_InetAddress* address; s4 port; } java_net_DatagramPacket; diff --git a/nat/java_util_zip_Deflater.h b/nat/java_util_zip_Deflater.h index 4a646f65e..52d9e68bc 100644 --- a/nat/java_util_zip_Deflater.h +++ b/nat/java_util_zip_Deflater.h @@ -9,7 +9,6 @@ typedef struct java_util_zip_Deflater { java_objectheader header; s4 level; s4 noHeader; - s4 strategy; s4 state; s4 totalOut; struct java_util_zip_DeflaterPending* pending;