diff src/protocols/zephyr/zephyr.h @ 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/zephyr.h	Mon Apr 25 00:31:24 2005 +0000
+++ b/src/protocols/zephyr/zephyr.h	Mon Apr 25 01:53:01 2005 +0000
@@ -5,7 +5,7 @@
  *
  *	$Source$
  *	$Author: thekingant $
- *	$Id: zephyr.h 8088 2003-11-11 07:08:13Z thekingant $
+ *	$Id: zephyr.h 12553 2005-04-25 01:53:01Z thekingant $
  *
  *	Copyright (c) 1987,1988,1991 by the Massachusetts Institute of
  *	Technology. For copying and distribution information, see the
@@ -20,11 +20,13 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <zephyr/zephyr_err.h>
+#include <zephyr_err.h>
 
 #ifndef IPPROTO_MAX	/* Make sure not already included */
+#ifndef WIN32
 #include <netinet/in.h>
 #endif
+#endif
 
 /* Use __STDC__ to guess whether we can use stdarg, prototypes, and const.
  * This is a public header file, so autoconf can't help us here. */
@@ -37,6 +39,16 @@
 # define ZCONST
 #endif
 
+#ifdef WIN32
+/* this really should be uint32_t */
+/*typedef unsigned int in_addr_t;
+struct in_addr
+{
+  in_addr_t s_addr;
+}; */
+#include <winsock2.h>
+#endif
+
 /* Service names */
 #define	HM_SVCNAME		"zephyr-hm"
 #define HM_SRV_SVCNAME		"zephyr-hm-srv"
@@ -243,7 +255,7 @@
 #define ZERR_NONE		0
 
 /* Hostmanager wait time (in secs) */
-#define HM_TIMEOUT		10
+#define HM_TIMEOUT		1
 
 /* Server wait time (in secs) */
 #define	SRV_TIMEOUT		30