diff src/protocols/zephyr/ZWait4Not.c @ 10867:5727afad0fb8

[gaim-migrate @ 12553] sf patch #991208, from Arun A Tharuvai "Here's a patch, against current CVS, to build and compile zephyr on Windows, with, or without Kerberos 4 Authentication. In order to be built (and run) with Kerberos 4 authentication, the Kerberos for Windows SDK (version 2.6.3 is the current version) (licensed under the MIT license) and runtimes, both available from http://web.mit.edu/kerberos/www/dist/index.html#KFW2.6.3 Also, USE_KRB4 should be set to true in the attached Makefile.mingw As on the UNIX side, an external 'zhm' binary needs to run for zephyr to work. Source and a win32 executable (using code from gaim's libzephyr, and also MIT's zephyr distribution), can be found at http://web.mit.edu/aatharuv/www/zhm-windows.html" I decided not to make zephyr compiled by default in Windows. If you want to compile it, I think you you can modify the root Makefile.mingw or cd to the src/protocols/zephyr/ directory and run "make -f Makefile.mingw" using make from mingw committer: Tailor Script <[e-mail]>

--- a/src/protocols/zephyr/ZWait4Not.c	Mon Apr 25 00:31:24 2005 +0000
+++ b/src/protocols/zephyr/ZWait4Not.c	Mon Apr 25 01:53:01 2005 +0000
@@ -5,7 +5,7 @@
  *	Created by:	<Joe Random Hacker>
  *
  *	$Source$
- *	$Author: chipx86 $
+ *	$Author: thekingant $
  *
  *	Copyright (c) 1991 by the Massachusetts Institute of Technology.
  *	For copying and distribution information, see the file
@@ -19,7 +19,27 @@
 #endif
 
 #include "internal.h"
+
+#ifdef WIN32
+#include <winsock2.h>
+
+#ifndef ZEPHYR_USES_KERBEROS
+static int  gettimeofday(struct timeval* tv, struct timezone* tz){
+     union {
+     long long ns100; /*time since 1 Jan 1601 in 100ns units */
+       FILETIME ft;
+     } _now;
+
+     GetSystemTimeAsFileTime( &(_now.ft) );
+     tv->tv_usec=(long)((_now.ns100 / 10LL) % 1000000LL );
+     tv->tv_sec= (long)((_now.ns100-(116444736000000000LL))/10000000LL);
+     return 0;
+   }
+#endif
+
+#else
 #include <sys/socket.h>
+#endif
 
 Code_t Z_WaitForNotice (notice, pred, arg, timeout)
      ZNotice_t *notice;
@@ -43,7 +63,7 @@
   FD_ZERO (&fdmask);
   tv.tv_sec = timeout;
   tv.tv_usec = 0;
-  gettimeofday (&t0, (struct timezone *) 0);
+  gettimeofday (&t0, (struct timezone *)NULL);
   t0.tv_sec += timeout;
   while (1) {
     FD_SET (fd, &fdmask);
@@ -58,7 +78,7 @@
       if (retval != ZERR_NONOTICE) /* includes ZERR_NONE */
 	return retval;
     }
-    gettimeofday (&tv, (struct timezone *) 0);
+    gettimeofday (&tv, (struct timezone *) NULL);
     tv.tv_usec = t0.tv_usec - tv.tv_usec;
     if (tv.tv_usec < 0) {
       tv.tv_usec += 1000000;