Index: native/jni/java-util/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-util/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- native/jni/java-util/Makefile.am	23 Oct 2005 16:59:08 -0000	1.8
+++ native/jni/java-util/Makefile.am	23 Jan 2006 07:45:26 -0000
@@ -1,6 +1,7 @@
 nativelib_LTLIBRARIES = libjavautil.la
 
 libjavautil_la_SOURCES = java_util_VMTimeZone.c
+libjavautil_la_LIBADD = $(top_builddir)/native/jni/classpath/libclasspath.la
 
 AM_LDFLAGS = @CLASSPATH_MODULE@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
Index: native/target/generic/target_generic_misc.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/target/generic/target_generic_misc.h,v
retrieving revision 1.14
diff -u -r1.14 target_generic_misc.h
--- native/target/generic/target_generic_misc.h	17 Jan 2006 12:29:40 -0000	1.14
+++ native/target/generic/target_generic_misc.h	23 Jan 2006 07:45:26 -0000
@@ -306,53 +306,6 @@
 *              'timezone' (e. g. Cygwin)
 \***********************************************************************/
 
-#if 0
-#ifndef NEW_CP
-#ifndef TARGET_NATIVE_MISC_GET_TIMEZONE_STRING
-  #if TIME_WITH_SYS_TIME
-     #include <sys/time.h>
-     #include <time.h>
-   #else
-     #if HAVE_SYS_TIME_H
-       #include <sys/time.h>
-     #else
-       #include <time.h>
-     #endif
-  #endif
-  #include <string.h>
-  #ifndef WITH_TIMEZONE_VARIABLE
-    #define WITH_TIMEZONE_VARIABLE timezone
-  #endif
-  #define TARGET_NATIVE_MISC_GET_TIMEZONE_STRING(string,maxStringLength,result) \
-    do { \
-      tzset(); \
-      \
-      if (strcmp(tzname[0],tzname[1])!=0) \
-      { \
-        result=((strlen(tzname[0])+6)<=maxStringLength)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \
-        if (result==TARGET_NATIVE_OK) \
-        { \
-          TARGET_NATIVE_MISC_FORMAT_STRING2(string,maxStringLength,"%s%ld",tzname[0],((WITH_TIMEZONE_VARIABLE%3600)==0)?WITH_TIMEZONE_VARIABLE/3600:WITH_TIMEZONE_VARIABLE); \
-        } \
-      } \
-      else \
-      { \
-        result=((strlen(tzname[0])+strlen(tzname[1])+6)<=maxStringLength)?TARGET_NATIVE_OK:TARGET_NATIVE_ERROR; \
-        if (result==TARGET_NATIVE_OK) \
-        { \
-          TARGET_NATIVE_MISC_FORMAT_STRING3(string,maxStringLength,"%s%ld%s",tzname[0],((WITH_TIMEZONE_VARIABLE%3600)==0)?WITH_TIMEZONE_VARIABLE/3600:WITH_TIMEZONE_VARIABLE,tzname[1]); \
-        } \
-      } \
-    } while (0)
-#endif
-#else /* NEW_CP */
-#ifndef TARGET_NATIVE_MISC_GET_TIMEZONE_STRING
-  #define TARGET_NATIVE_MISC_GET_TIMEZONE_STRING(string,maxStringLength,result) \
-    CP_MISC_GET_TIMEZONE_STRING(string,maxStringLength,result)
-#endif
-#endif /* NEW_CP */
-#endif /* 0 */
-
 #ifndef NEW_CP
 #ifndef TARGET_NATIVE_MISC_GET_TIMEZONE_STRING
   #define TARGET_NATIVE_MISC_GET_TIMEZONE_STRING_GENERIC
Index: native/target/generic/target_generic_network.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/target/generic/target_generic_network.h,v
retrieving revision 1.19
diff -u -r1.19 target_generic_network.h
--- native/target/generic/target_generic_network.h	17 Jan 2006 12:29:40 -0000	1.19
+++ native/target/generic/target_generic_network.h	23 Jan 2006 07:45:26 -0000
@@ -892,6 +892,15 @@
     #include <sys/types.h>
     #include <sys/socket.h>
     #include <netinet/in.h>
+    #ifdef MSG_NOSIGNAL
+      #define HAVE_MSG_NOSIGNAL
+    #else /* MSG_NOSIGNAL */
+      #ifdef SO_NOSIGPIPE
+        #define MSG_NOSIGNAL SO_NOSIGPIPE
+      #else /* SO_NOSIGPIPE */
+        #define MSG_NOSIGNAL 0
+      #endif /* SO_NOSIGPIPE */
+    #endif /* MSG_NOSIGNAL */
     #define TARGET_NATIVE_NETWORK_SOCKET_SEND(socketDescriptor,buffer,length,bytesSent) \
       do { \
         bytesSent=send(socketDescriptor,buffer,length,MSG_NOSIGNAL); \