Index: lib/Makefile.inc
===================================================================
RCS file: /cvsroot/curl/curl/lib/Makefile.inc,v
retrieving revision 1.19
diff -U 3 -r1.19 Makefile.inc
--- lib/Makefile.inc	31 Mar 2008 12:09:43 -0000	1.19
+++ lib/Makefile.inc	27 May 2008 18:37:31 -0000
@@ -20,4 +20,4 @@
   strtoofft.h strerror.h inet_ntop.h curlx.h memory.h setup.h		\
   transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h	\
   tftp.h sockaddr.h splay.h strdup.h setup_once.h socks.h ssh.h nssg.h	\
-  qssl.h
+  qssl.h gssmitmac.h
Index: lib/gssmitmac.h
===================================================================
RCS file: lib/gssmitmac.h
diff -N lib/gssmitmac.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lib/gssmitmac.h	27 May 2008 18:37:31 -0000
@@ -0,0 +1,47 @@
+#ifndef __GSSMITMAC_H
+#define __GSSMITMAC_H
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ * $Id$
+ ***************************************************************************/
+
+/* Only for WIN32 builds */
+#ifdef WIN32
+
+/* Prevent inclusion of MIT's Kerberos for Windows (KfW) win-mac.h header
+   file, which hurts us with definitions that clutter public namespace */
+#define _KRB5_WIN_MAC_H 1
+
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#elif defined(_MSC_VER)
+  typedef __int32 int32_t;
+  typedef unsigned __int32 uint32_t;
+#endif
+
+#ifndef KRB5_CALLCONV
+# define KRB5_CALLCONV __stdcall
+# define KRB5_CALLCONV_C __cdecl
+#endif
+
+#endif /* WIN32 */
+
+#endif /* __GSSMITMAC_H */
Index: lib/krb5.c
===================================================================
RCS file: /cvsroot/curl/curl/lib/krb5.c,v
retrieving revision 1.7
diff -U 3 -r1.7 krb5.c
--- lib/krb5.c	22 May 2008 19:44:10 -0000	1.7
+++ lib/krb5.c	27 May 2008 18:37:32 -0000
@@ -47,6 +47,7 @@
 #include <string.h>
 #ifdef HAVE_GSSMIT
 /* MIT style */
+#include "gssmitmac.h"
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_generic.h>
 #include <gssapi/gssapi_krb5.h>
Index: lib/urldata.h
===================================================================
RCS file: /cvsroot/curl/curl/lib/urldata.h,v
retrieving revision 1.378
diff -U 3 -r1.378 urldata.h
--- lib/urldata.h	30 Apr 2008 21:20:09 -0000	1.378
+++ lib/urldata.h	27 May 2008 18:37:34 -0000
@@ -115,6 +115,7 @@
 # ifdef HAVE_GSSGNU
 #  include <gss.h>
 # elif defined HAVE_GSSMIT
+#  include "gssmitmac.h"
 #  include <gssapi/gssapi.h>
 #  include <gssapi/gssapi_generic.h>
 # else