WIN32 compilation error fixes.

[silc.git] / lib / silcutil / win32 / silcwin32util.c

diff --git a/lib/silcutil/win32/silcwin32util.c b/lib/silcutil/win32/silcwin32util.c
index 5fac7e6f565a42c0153a465d3c07807443bede22..1e6549b78b519977c4eddadf9628ef47dc255465 100644 (file)
--- a/lib/silcutil/win32/silcwin32util.c
+++ b/lib/silcutil/win32/silcwin32util.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2001 - 2006 Pekka Riikonen
+  Copyright (C) 2001 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -20,27 +20,6 @@
 
 #include "silc.h"
 
-/* XXX GNU regex may work on Win32 too!! */
-char *silc_string_regexify(const char *string)
-{
-  return strdup(string);
-}
-
-char *silc_string_regex_combine(const char *string1, const char *string2)
-{
-  return strdup(string1);
-}
-
-int silc_string_regex_match(const char *regex, const char *string)
-{
-  return TRUE;
-}
-
-int silc_string_match(const char *string1, const char *string2)
-{
-  return TRUE;
-}
-
 #define FILETIME_1970 0x019db1ded53e8000
 const BYTE DWLEN = sizeof(DWORD) * 8;
 
@@ -50,13 +29,13 @@ const BYTE DWLEN = sizeof(DWORD) * 8;
 int silc_gettimeofday(struct timeval *tv)
 {
   FILETIME ft;
-  __int64 msec;
+  __int64 usec;
 
   GetSystemTimeAsFileTime(&ft);
-  msec = (__int64) ft.dwHighDateTime << DWLEN | ft.dwLowDateTime;
-  msec = (msec - FILETIME_1970) / 10;
-  tv->tv_sec  = (long) (msec / 1000000);
-  tv->tv_usec = (long) (msec % 1000000);
+  usec = (__int64) ft.dwHighDateTime << DWLEN | ft.dwLowDateTime;
+  usec = (usec - FILETIME_1970) / 10;
+  tv->tv_sec  = (long) (usec / 1000000);
+  tv->tv_usec = (long) (usec % 1000000);
 
   return 0;
 }
@@ -76,5 +55,5 @@ char *silc_get_real_name(void)
 
 int silc_file_set_nonblock(int fd)
 {
-  return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
+  return 0;
 }