updates

diff --git a/acconfig.h.pre b/acconfig.h.pre
index ff11e7d546ec68ae56ba64397a539abda264e3c4..89d6007f85300db18afdf5aad8194dc75a5b01c3 100644 (file)
--- a/acconfig.h.pre
+++ b/acconfig.h.pre
@@ -12,10 +12,11 @@
 
 /* Multi-thread support */
 #undef SILC_THREADS
-#undef SILC_HAVE_PTHREAD
 
-/* IPv6 support */
+#ifndef SILC_WIN32
+#undef SILC_HAVE_PTHREAD
 #undef HAVE_IPV6
+#endif
 
 /* Default paths */
 #undef SILC_ETCDIR

diff --git a/lib/silcutil/win32/silcwin32util.c b/lib/silcutil/win32/silcwin32util.c
index d7051c384abcd5424d3d77e54fa9300c7b5e7a4e..c8d9c9bf5304c99713640783054c43bd561d9025 100644 (file)
--- a/lib/silcutil/win32/silcwin32util.c
+++ b/lib/silcutil/win32/silcwin32util.c
@@ -51,10 +51,10 @@ const BYTE DWLEN = sizeof(DWORD) * 8;
 int silc_gettimeofday(struct timeval *tv)
 {
   FILETIME ft;
-  __SilcInt64 msec;
+  __int64 msec;
   
   GetSystemTimeAsFileTime(&ft);
-  msec = (__SilcInt64) ft.dwHighDateTime << DWLEN | ft.dwLowDateTime;
+  msec = (__int64) ft.dwHighDateTime << DWLEN | ft.dwLowDateTime;
   msec = (msec - FILETIME_1970) / 10;
   tv->tv_sec  = (long) (msec / 1000000);
   tv->tv_usec = (long) (msec % 1000000);

diff --git a/win32/libsilc/libsilc.def b/win32/libsilc/libsilc.def
index 3691c4cae3d83b116e0b7b671b7b2fa2270dc379..d25ad0e4c31d0f0b4a848215ba9b74f3693d7ed9 100644 (file)
--- a/win32/libsilc/libsilc.def
+++ b/win32/libsilc/libsilc.def
@@ -105,8 +105,6 @@ EXPORTS
        silc_command_reply_payload_encode_va @ 322 ; 
        silc_command_set_command @ 323 ; 
        silc_command_set_ident @ 324 ; 
-       silc_config_check_num_token @ 325 ; 
-       silc_config_get_token @ 326 ; 
        silc_config_open @ 327 ; 
        silc_debug @ 328 DATA ; 
        silc_decode_pem @ 329 ; 
@@ -450,7 +448,6 @@ EXPORTS
        silc_ske_abort @ 671 ; 
        silc_ske_alloc @ 672 ; 
        silc_ske_assemble_security_properties @ 673 ; 
-       silc_ske_create_rnd @ 674 ; 
        silc_ske_end @ 675 ; 
        silc_ske_free @ 676 ; 
        silc_ske_free_key_material @ 677 ; 
@@ -463,7 +460,6 @@ EXPORTS
        silc_ske_initiator_phase_1 @ 684 ; 
        silc_ske_initiator_phase_2 @ 685 ; 
        silc_ske_initiator_start @ 686 ; 
-       silc_ske_make_hash @ 687 ; 
        silc_ske_payload_ke_decode @ 688 ; 
        silc_ske_payload_ke_encode @ 689 ; 
        silc_ske_payload_ke_free @ 690 ; 

diff --git a/win32/libsilc/libsilc.dsp b/win32/libsilc/libsilc.dsp
index 5c35110e46ca703a207e38da4599b161c664e62b..3ac00fdda9ba83b135adf9b0fa96bffb11a74b89 100644 (file)
--- a/win32/libsilc/libsilc.dsp
+++ b/win32/libsilc/libsilc.dsp
@@ -447,6 +447,10 @@ SOURCE=..\..\lib\silcutil\silcdlist.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\lib\silcutil\silcfileutil.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\lib\silcutil\silchashtable.h\r
 # End Source File\r
 # Begin Source File\r
@@ -682,10 +686,6 @@ SOURCE=..\..\lib\silcsftp\silcsftp.h
 SOURCE=..\..\lib\silcsftp\silcsftp_fs.h\r
 # End Source File\r
 # End Group\r
-# Begin Source File\r
-\r
-SOURCE=..\silcdefs.h\r
-# End Source File\r
 # End Group\r
 # Begin Group "Resource Files"\r
 \r

diff --git a/win32/libsilcclient/libsilcclient.def b/win32/libsilcclient/libsilcclient.def
index 8cea6bb7705044fb03d671b2e39261aa0b72700f..690929de5a3e493cd5f8a06fdeca4c35da85720d 100644 (file)
--- a/win32/libsilcclient/libsilcclient.def
+++ b/win32/libsilcclient/libsilcclient.def
@@ -118,7 +118,6 @@ EXPORTS
        silc_client_key_agreement @ 101 ; 
        silc_client_list_channel_private_keys @ 102 ; 
        silc_client_list_private_message_keys @ 103 ; 
-       silc_client_new_channel_id @ 104 ; 
        silc_client_notify_by_server @ 105 ; 
        silc_client_packet_process @ 106 ; 
        silc_client_packet_send @ 107 ; 
@@ -147,7 +146,6 @@ EXPORTS
        silc_client_start_key_exchange @ 131 ; 
        silc_client_stop @ 132 ; 
        silc_command_status_messages @ 135 DATA ; 
-       silc_idlist_get_channel_by_id @ 136 ; 
        silc_idlist_get_client @ 137 ; 
        silc_client_abort_key_agreement @ 138 ; 
        silc_client_set_away_message @ 139 ;