diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/Class.h | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 4 | ||||
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index df55425..c4600bf 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -49,7 +49,7 @@ struct _Jv_Constants { jint size; jbyte *tags; - void **data; + _Jv_word *data; }; struct _Jv_Method @@ -192,7 +192,7 @@ private: friend int _Jv_DetermineVTableIndex (jclass, _Jv_Utf8Const *, _Jv_Utf8Const*); friend void _Jv_InitField (jobject, jclass, int); - friend void* _Jv_ResolvePoolEntry (jclass, int); + friend _Jv_word _Jv_ResolvePoolEntry (jclass, int); friend void _Jv_PrepareClass (jclass); friend class _Jv_ClassReader; diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 13452ec..0caaa4c 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -233,8 +233,8 @@ _Jv_InternClassStrings(jclass klass) if (pool->tags[i] == JV_CONSTANT_String) { jstring str; - str = _Jv_NewStringUtf8Const ((_Jv_Utf8Const *) pool->data[i]); - pool->data[i] = (void *) str; + str = _Jv_NewStringUtf8Const (pool->data[i].utf8); + pool->data[i].string = str; pool->tags[i] |= JV_CONSTANT_ResolvedFlag; } } diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index e652ba7..fc8d814 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -11,7 +11,9 @@ details. */ #include <sys/types.h> #include <sys/socket.h> #include <sys/time.h> +#ifdef HAVE_SYS_SELECT_H #include <sys/select.h> +#endif #include <netinet/in.h> #include <netinet/tcp.h> #include <errno.h> |