Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 17679)
+++ src/Makefile.in	(working copy)
@@ -153,7 +153,7 @@
 # try to build wconfig on a config-windows.
 #
 ##DOS##$(WCONFIG_EXE): outpre-dir wconfig.c
-##DOS##	$(CC) -Fe$@ -Fo$*.obj wconfig.c
+##DOS##	$(CC) -Fe$@ -Fo$*.obj wconfig.c $(CCLINKOPTION)
 
 ##DOS##MKFDEP=$(WCONFIG_EXE) config\win-pre.in config\win-post.in
 
Index: src/include/win-mac.h
===================================================================
--- src/include/win-mac.h	(revision 17679)
+++ src/include/win-mac.h	(working copy)
@@ -25,6 +25,21 @@
 
 #else /* ! RES_ONLY */
 
+/* To ensure backward compatibility of the ABI use 32-bit time_t on 
+ * 32-bit Windows. 
+ */
+#ifdef _KRB5_INT_H
+#ifdef KRB5_GENERAL__
+#error krb5.h included before k5-int.h
+#endif /* KRB5_GENERAL__ */
+#if _INTEGRAL_MAX_BITS >= 64 && _MSC_VER >= 1400 && !defined(_WIN64) && !defined(_USE_32BIT_TIME_T)
+#if defined(_TIME_T_DEFINED) || defined(_INC_IO) || defined(_INC_TIME) || defined(_INC_WCHAR)
+#error time_t has been defined as a 64-bit integer which is incompatible with Kerberos on this platform.
+#endif /* _TIME_T_DEFINED */
+#define _USE_32BIT_TIME_T
+#endif 
+#endif
+
 #define SIZEOF_INT      4
 #define SIZEOF_SHORT    2
 #define SIZEOF_LONG     4
@@ -40,21 +55,6 @@
 #endif
 #endif
 
-/* To ensure backward compatibility of the ABI use 32-bit time_t on 
- * 32-bit Windows. 
- */
-#ifdef _KRB5_INT_H
-#ifdef KRB5_GENERAL__
-#error krb5.h included before k5-int.h
-#endif /* KRB5_GENERAL__ */
-#if _INTEGRAL_MAX_BITS >= 64 && _MSC_VER >= 1400 && !defined(_WIN64) && !defined(_USE_32BIT_TIME_T)
-#if defined(_TIME_T_DEFINED) || defined(_INC_IO) || defined(_INC_TIME) || defined(_INC_WCHAR)
-#error time_t has been defined as a 64-bit integer which is incompatible with Kerberos on this platform.
-#endif /* _TIME_T_DEFINED */
-#define _USE_32BIT_TIME_T
-#endif 
-#endif
-
 #ifndef KRB5_CALLCONV
 #  define KRB5_CALLCONV __stdcall
 #  define KRB5_CALLCONV_C __cdecl
Index: src/include/ChangeLog
===================================================================
--- src/include/ChangeLog	(revision 17679)
+++ src/include/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* win-mac.h: support for 64-bit Windows builds
+
 2006-01-25  Ken Raeburn  <raeburn@mit.edu>
 
 	* k5-thread.h (krb5int_mutex_alloc, krb5int_mutex_free,
Index: src/ChangeLog
===================================================================
--- src/ChangeLog	(revision 17679)
+++ src/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2006-01-17  Ken Raeburn  <raeburn@mit.edu>
 
 	* aclocal.m4 (AC_KRB5_TCL_TRYOLD): Include $LIBS in $TCL_LIBS.
Index: src/windows/Makefile.in
===================================================================
--- src/windows/Makefile.in	(revision 17679)
+++ src/windows/Makefile.in	(working copy)
@@ -14,9 +14,11 @@
 	@echo Making in windows\wintel
 	cd ..\wintel
 	$(MAKE) -$(MFLAGS)
-	@echo Making in windows\gss
+!if ( "$(CPU)" != "ALPHA64" ) && ( "$(CPU)" != "IA64" ) && ( "$(CPU)" != "AMD64" )
+       @echo Making in windows\gss
 	cd ..\gss
 	$(MAKE) -$(MFLAGS)
+!endif
 	@echo Making in windows\gina
 	cd ..\gina
 	$(MAKE) -$(MFLAGS)
Index: src/windows/cns/Makefile.in
===================================================================
--- src/windows/cns/Makefile.in	(revision 17679)
+++ src/windows/cns/Makefile.in	(working copy)
@@ -54,7 +54,7 @@
 
 $(OUTPRE)$(NAME).exe: $(NAME).def $(OBJS) $(XOBJS) $(LIBS)
 	$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \
-	  $(LIBS) $(SYSLIBS)
+	  $(LIBS) $(SYSLIBS) $(SCLIB)
 
 install::
 	$(CP) $(OUTPRE)$(NAME).exe $(DESTDIR)
Index: src/windows/cns/password.c
===================================================================
--- src/windows/cns/password.c	(revision 17679)
+++ src/windows/cns/password.c	(working copy)
@@ -277,7 +277,7 @@
   case WM_SETCURSOR:
     if (isblocking) {
       SetCursor(LoadCursor(NULL, IDC_WAIT));
-      SetWindowLong(hwnd, DWL_MSGRESULT, TRUE);
+      SetWindowLongPtr(hwnd, DWLP_MSGRESULT, TRUE);
 
       return TRUE;
     }
Index: src/windows/cns/ChangeLog
===================================================================
--- src/windows/cns/ChangeLog	(revision 17679)
+++ src/windows/cns/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in, password.c: support for 64-bit Windows builds
+
 2005-03-15  Jeffrey Altman <jaltman@mit.edu>
 
         * tktlist.c: do not mix pointers to long and time_t 
Index: src/windows/kfwlogon/Makefile.in
===================================================================
--- src/windows/kfwlogon/Makefile.in	(revision 17679)
+++ src/windows/kfwlogon/Makefile.in	(working copy)
@@ -1,37 +1,37 @@
-# Makefile for the KFW Network Provider
-#
-
-thisconfigdir=./..
-myfulldir=windows/nplogon
-mydir=.
-BUILDTOP=$(REL)..$(S)..
-DEFINES = 
-LOCALINCLUDES = -I$(BUILDTOP) -I$(PISMERE)\athena\util\loadfuncs \
-	-I$(PISMERE)\athena\auth\krb5\src\include\kerberosIV \
-	-I$(PISMERE)\athena\auth\krb4\include \
-	-I$(PISMERE)\athena\auth\leash\include
-PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR)
-
-SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib
-RFLAGS = $(LOCALINCLUDES)
-RCFLAGS = $(RFLAGS) -D_WIN32
-
-all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe
-
-$(OUTPRE)kfwlogon.res: kfwlogon.rc ..\version.rc
-
-$(OUTPRE)kfwcpcc.res: kfwcpcc.rc ..\version.rc
-
-$(OUTPRE)kfwlogon.dll: $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwlogon.res
-    link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB)
-
-$(OUTPRE)kfwcpcc.exe: $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwcpcc.res
-    link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB)
-
-install::
-        copy $(OUTPRE)kfwlogon.dll $(DESTDIR)
-        copy $(OUTPRE)kfwcpcc.exe  $(DESTDIR)
-
-clean::
-        $(RM) $(OUTPRE)*.exe $(OUTPRE)*.dll $(OUTPRE)*.res
-
+# Makefile for the KFW Network Provider
+#
+
+thisconfigdir=./..
+myfulldir=windows/nplogon
+mydir=.
+BUILDTOP=$(REL)..$(S)..
+DEFINES = 
+LOCALINCLUDES = -I$(BUILDTOP) -I$(PISMERE)\athena\util\loadfuncs \
+	-I$(PISMERE)\athena\auth\krb5\src\include\kerberosIV \
+	-I$(PISMERE)\athena\auth\krb4\include \
+	-I$(PISMERE)\athena\auth\leash\include
+PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR)
+
+SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib
+RFLAGS = $(LOCALINCLUDES)
+RCFLAGS = $(RFLAGS) -D_WIN32
+
+all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe
+
+$(OUTPRE)kfwlogon.res: kfwlogon.rc ..\version.rc
+
+$(OUTPRE)kfwcpcc.res: kfwcpcc.rc ..\version.rc
+
+$(OUTPRE)kfwlogon.dll: $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwlogon.res
+    link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB)
+
+$(OUTPRE)kfwcpcc.exe: $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwcpcc.res
+    link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB)
+
+install::
+        copy $(OUTPRE)kfwlogon.dll $(DESTDIR)
+        copy $(OUTPRE)kfwcpcc.exe  $(DESTDIR)
+
+clean::
+        $(RM) $(OUTPRE)*.exe $(OUTPRE)*.dll $(OUTPRE)*.res
+
Index: src/windows/ChangeLog
===================================================================
--- src/windows/ChangeLog	(revision 17679)
+++ src/windows/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2005-11-29  Jeffrey Altman <jaltman@mit.edu>
 
 	* Makefile.in: build src/windows/kfwlogon
Index: src/windows/wintel/Makefile.in
===================================================================
--- src/windows/wintel/Makefile.in	(revision 17679)
+++ src/windows/wintel/Makefile.in	(working copy)
@@ -34,7 +34,7 @@
 
 $(OUTPRE)telnet.exe: telnet.def $(OBJS) $(XOBJS) $(LIBS)
 	$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \
-	  $(LIBS) $(SYSLIBS)
+	  $(LIBS) $(SYSLIBS) $(SCLIB)
 
 install::
 	copy $(OUTPRE)telnet.exe $(DESTDIR)
Index: src/windows/wintel/ChangeLog
===================================================================
--- src/windows/wintel/ChangeLog	(revision 17679)
+++ src/windows/wintel/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2004-09-30  Jeffrey Altman <jaltman@mit.edu>
 
         * Makefile.in: Add $(BUILDTOP) to include path for patchlevel.h
Index: src/windows/gina/Makefile.in
===================================================================
--- src/windows/gina/Makefile.in	(revision 17679)
+++ src/windows/gina/Makefile.in	(working copy)
@@ -27,7 +27,7 @@
 
 $(OUTPRE)kgina.dll: $(OBJS) $(KLIB) $(CLIB)
 	link $(WINDLLFLAGS) -def:gina.def -out:$*.dll \
-	   $** $(WINLIBS)
+	   $** $(WINLIBS) $(SCLIB)
 
 $(OUTPRE)ginastub.obj: ginastub.h
 
Index: src/windows/gina/ChangeLog
===================================================================
--- src/windows/gina/ChangeLog	(revision 17679)
+++ src/windows/gina/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2005-10-20  Jeffrey Altman <jaltman@mit.edu>
 
 	* Makefile.in (WINLIBS): Link to the multi-threaded library.
Index: src/appl/gssftp/ftp/Makefile.in
===================================================================
--- src/appl/gssftp/ftp/Makefile.in	(revision 17679)
+++ src/appl/gssftp/ftp/Makefile.in	(working copy)
@@ -37,7 +37,7 @@
 	$(CC_LINK) -o ftp $(OBJS) $(GSS_LIBS) $(KRB4COMPAT_LIBS)
 
 $(OUTPRE)ftp.exe: $(OBJS) $(GLIB) $(KLIB)
-	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib advapi32.lib
+	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib advapi32.lib $(SCLIB)
 
 clean-unix::
 	$(RM) ftp
Index: src/appl/gssftp/ftp/ChangeLog
===================================================================
--- src/appl/gssftp/ftp/ChangeLog	(revision 17679)
+++ src/appl/gssftp/ftp/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2003-12-13  Ken Raeburn  <raeburn@mit.edu>
 
 	* ftp.c (do_auth): Handle a return code of 335, where the
Index: src/appl/gss-sample/Makefile.in
===================================================================
--- src/appl/gss-sample/Makefile.in	(revision 17679)
+++ src/appl/gss-sample/Makefile.in	(working copy)
@@ -20,10 +20,10 @@
 	$(CC_LINK) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS)
 
 $(OUTPRE)gss-server.exe: $(OUTPRE)gss-server.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB)
-	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
+	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB)
 
 $(OUTPRE)gss-client.exe: $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB)
-	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib
+	link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB)
 
 clean-unix::
 	$(RM) gss-server gss-client
Index: src/appl/gss-sample/ChangeLog
===================================================================
--- src/appl/gss-sample/ChangeLog	(revision 17679)
+++ src/appl/gss-sample/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2005-10-20  Ken Raeburn  <raeburn@mit.edu>
 
 	* gss-client.c, gss-misc.c, gss-server.c: Reindented.
Index: src/clients/kpasswd/Makefile.in
===================================================================
--- src/clients/kpasswd/Makefile.in	(revision 17679)
+++ src/clients/kpasswd/Makefile.in	(working copy)
@@ -26,4 +26,4 @@
 all-windows:: $(OUTPRE)kpasswd.exe
 
 $(OUTPRE)kpasswd.exe: $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB)
-	link $(EXE_LINKOPTS) -out:$@ $**
+	link $(EXE_LINKOPTS) -out:$@ $** $(SCLIB)
Index: src/clients/kpasswd/ChangeLog
===================================================================
--- src/clients/kpasswd/ChangeLog	(revision 17679)
+++ src/clients/kpasswd/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2004-06-24  Tom Yu  <tlyu@mit.edu>
 
 	* kpasswd.c (P1, P2): Cosmetic fix for prompts to avoid
Index: src/config/win-post.in
===================================================================
--- src/config/win-post.in	(revision 17679)
+++ src/config/win-post.in	(working copy)
@@ -34,6 +34,14 @@
 	$(WCONFIG) $(BUILDTOP)\config < Makefile.in > Makefile
 !endif
 
+!if  ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
+!if defined(WIN64LIBNAME)
+LIBNAME=$(WIN64LIBNAME)
+!endif
+!if defined(WIN64OBJFILE)
+OBJFILE=$(WIN64OBJFILE)
+!endif
+!endif
 
 !if defined(LIBNAME)
 
Index: src/config/win-pre.in
===================================================================
--- src/config/win-pre.in	(revision 17679)
+++ src/config/win-pre.in	(working copy)
@@ -31,8 +31,8 @@
 CPU=i386
 !endif # CPU == X86
 
-!if ( "$(CPU)" != "i386" ) && ( "$(CPU)" != "ALPHA" )
-!error Must specify CPU environment variable ( CPU=i386, CPU=ALPHA)
+!if ( "$(CPU)" != "i386" ) && ( "$(CPU)" != "ALPHA" ) && ( "$(CPU)" != "ALPHA64" ) && ( "$(CPU)" != "IA64" ) && ( "$(CPU)" != "AMD64" )
+!error Must specify CPU environment variable ( CPU=i386, CPU=ALPHA, CPU=ALPHA64,CPU=IA64, CPU=AMD64)
 !endif
 #
 # End of figuring out CPU
@@ -116,6 +116,10 @@
 DNSFLAGS=
 !endif
 
+!if ("$(CPU)" == "i386")
+TIME_T_FLAGS=-D_USE_32BIT_TIME_T
+!endif
+
 !if defined(KRB5_KFW_COMPILE)
 KFWFLAGS=-DUSE_LEASH=1
 !endif
@@ -126,10 +130,20 @@
 CC=cl
 
 PDB_OPTS=-Fd$(OUTPRE)\ -FD
-CPPFLAGS=-I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 $(DNSFLAGS) -DKRB5_PRIVATE=1 -DWIN32_LEAN_AND_MEAN -DKRB5_DEPRECATED=1 $(KFWFLAGS)
+CPPFLAGS=-I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 $(DNSFLAGS) -DKRB5_PRIVATE=1 -DWIN32_LEAN_AND_MEAN -DKRB5_DEPRECATED=1 -D_CRT_SECURE_NO_DEPRECATE $(KFWFLAGS) $(TIME_T_FLAGS)
 CCOPTS=-nologo /W3 $(PDB_OPTS) $(DLL_FILE_DEF)
 LOPTS=-nologo -incremental:no
 
+!if  ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
+CCLINKOPTION=/link bufferoverflowu.lib
+SCLIB=bufferoverflowu.lib
+DEBUGOPT=/Zi
+!else
+CCLINKOPTION=
+SCLIB=
+DEBUGOPT=/ZI
+!endif
+
 # /ZI gives better debug info in each object file (MSVC 6.0 or higher).
 # /Zi gives debug info in each object file.
 # /Gs Avoid stack probes (they don't seem to work anyway)
@@ -143,13 +157,13 @@
 #
 !ifdef NODEBUG
 !ifdef DEBUG_SYMBOL
-CCOPTS=/ZI $(CCOPTS)
+CCOPTS=$(DEBUGOPT) $(CCOPTS)
 LOPTS=$(LOPTS) -debug
 !endif
 CCOPTS=/Os /MD $(CCOPTS)
 LOPTS=$(LOPTS)
 !else
-CCOPTS=/Od /ZI /MDd $(CCOPTS)
+CCOPTS=/Od $(DEBUGOPT) /MDd $(CCOPTS)
 LOPTS=$(LOPTS) -debug
 !endif
 
@@ -178,6 +192,17 @@
 GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi32.lib
 WLIB=
 
+!if  ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
+CLIB=$(BUILDTOP)\lib\$(OUTPRE)comerr64.lib
+PLIB=$(BUILDTOP)\lib\$(OUTPRE)xpprof64.lib
+KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_64.lib
+K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_64.lib
+SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt64.lib
+GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi64.lib
+WLIB=
+
+!endif
+
 KRB4_INCLUDES=-I$(BUILDTOP)/include/kerberosIV
 
 COM_ERR_DEPS	= $(BUILDTOP)/include/com_err.h
Index: src/config/ChangeLog
===================================================================
--- src/config/ChangeLog	(revision 17679)
+++ src/config/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* win-pre.in, win-post.in: support for 64-bit Windows builds
+
 2006-01-25  Ken Raeburn  <raeburn@mit.edu>
 
 	* shlib.conf (*-*-linux*): Run export-check.pl after building a
Index: src/lib/Makefile.in
===================================================================
--- src/lib/Makefile.in	(revision 17679)
+++ src/lib/Makefile.in	(working copy)
@@ -28,46 +28,55 @@
 ##MIT##MITLIBS=$(VS_LIB)
 ##MIT##MITFLAGS=-I$(VS_INC) /DVERSERV=1
 
-SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)k5sprt32.lib
-CLIBS = $(BUILDTOP)\util\et\$(OUTPRE)comerr.lib
-PLIBS = $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib
-KLIBS = krb5\$(OUTPRE)krb5.lib crypto\$(OUTPRE)crypto.lib \
-	$(BUILDTOP)\util\profile\$(OUTPRE)profile.lib \
-	des425\$(OUTPRE)des425.lib
-GLIBS = gssapi\$(OUTPRE)gssapi.lib
-K4LIBS = krb4\$(OUTPRE)krb4.lib
 
-SDEF = k5sprt32.def
-CDEF = comerr32.def
-PDEF = xpprof32.def
-KDEF = krb5_32.def
-GDEF = gssapi32.def
-K4DEF = krb4_32.def
 
-KRB5RC = krb5.rc
-VERSIONRC = $(BUILDTOP)\windows\version.rc
+##WIN32##!if  ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" )
+##WIN32##SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)k5sprt64.lib
+##WIN32##!else
+##WIN32##SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)k5sprt32.lib
+##WIN32##!endif
+##WIN32##CLIBS = $(BUILDTOP)\util\et\$(OUTPRE)comerr.lib
+##WIN32##PLIBS = $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib
+##WIN32##KLIBS = krb5\$(OUTPRE)krb5.lib crypto\$(OUTPRE)crypto.lib \
+##WIN32##	$(BUILDTOP)\util\profile\$(OUTPRE)profile.lib \
+##WIN32##	des425\$(OUTPRE)des425.lib
+##WIN32##GLIBS = gssapi\$(OUTPRE)gssapi.lib
+##WIN32##K4LIBS = krb4\$(OUTPRE)krb4.lib
 
-WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \
-	version.lib secur32.lib advapi32.lib gdi32.lib delayimp.lib
-WINDLLFLAGS = $(DLL_LINKOPTS) -base:0x1c000000 /DELAYLOAD:secur32.dll \
-	/DELAYLOAD:advapi32.dll /DELAY:UNLOAD /DELAY:NOBIND
 
-S_GLUE=$(OUTPRE)support_glue.obj
-K5_GLUE=$(OUTPRE)k5_glue.obj
-K4_GLUE=$(OUTPRE)k4_glue.obj
-GSS_GLUE=$(OUTPRE)gss_glue.obj
-COMERR_GLUE=$(OUTPRE)comerr_glue.obj
-PROF_GLUE=$(OUTPRE)prof_glue.obj
+##WIN32##SDEF = k5sprt32.def
+##WIN32##CDEF = comerr32.def
+##WIN32##PDEF = xpprof32.def
+##WIN32##KDEF = krb5_32.def
+##WIN32##GDEF = gssapi32.def
+##WIN32##K4DEF = krb4_32.def
 
-SGLUE=$(S_GLUE)
-CGLUE=$(COMERR_GLUE)
-PGLUE=$(PROF_GLUE)
-KGLUE=$(K5_GLUE)
-GGLUE=$(GSS_GLUE)
-K4GLUE=$(K4_GLUE)
 
-RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY
 
+##WIN32##KRB5RC = krb5.rc
+##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
+
+##WIN32##WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \
+##WIN32##	version.lib secur32.lib advapi32.lib gdi32.lib delayimp.lib
+##WIN32##WINDLLFLAGS = $(DLL_LINKOPTS) -base:0x1c000000 /DELAYLOAD:secur32.dll \
+##WIN32##	/DELAYLOAD:advapi32.dll /DELAY:UNLOAD /DELAY:NOBIND
+
+##WIN32##S_GLUE=$(OUTPRE)support_glue.obj
+##WIN32##K5_GLUE=$(OUTPRE)k5_glue.obj
+##WIN32##K4_GLUE=$(OUTPRE)k4_glue.obj
+##WIN32##GSS_GLUE=$(OUTPRE)gss_glue.obj
+##WIN32##COMERR_GLUE=$(OUTPRE)comerr_glue.obj
+##WIN32##PROF_GLUE=$(OUTPRE)prof_glue.obj
+
+##WIN32##SGLUE=$(S_GLUE)
+##WIN32##CGLUE=$(COMERR_GLUE)
+##WIN32##PGLUE=$(PROF_GLUE)
+##WIN32##KGLUE=$(K5_GLUE)
+##WIN32##GGLUE=$(GSS_GLUE)
+##WIN32##K4GLUE=$(K4_GLUE)
+
+##WIN32##RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY
+
 ##WIN32##SRES=$(SLIB:.lib=.res)
 ##WIN32##CRES=$(CLIB:.lib=.res)
 ##WIN32##PRES=$(PLIB:.lib=.res)
@@ -91,16 +100,16 @@
 
 ##WIN32##$(SLIB): $(SDEF) $(SLIBS) $(SGLUE) $(SRES)
 ##WIN32##	link $(WINDLLFLAGS) -def:$(SDEF) -out:$*.dll \
-##WIN32##	  $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS)
-$(SDEF): ..\util\support\libkrb5support.exports
-	echo EXPORTS > $(SDEF).new
-	type ..\util\support\libkrb5support.exports >> $(SDEF).new
-	-$(RM) $(SDEF)
-	ren $(SDEF).new $(SDEF)
+##WIN32##	  $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS) $(SCLIB)
+##WIN32##$(SDEF): ..\util\support\libkrb5support.exports
+##WIN32##	echo EXPORTS > $(SDEF).new
+##WIN32##	type ..\util\support\libkrb5support.exports >> $(SDEF).new
+##WIN32##	-$(RM) $(SDEF)
+##WIN32##	ren $(SDEF).new $(SDEF)
 
 ##WIN32##$(CLIB): $(CDEF) $(CLIBS) $(CGLUE) $(CRES) $(SLIB)
 ##WIN32##	link $(WINDLLFLAGS) -def:$(CDEF) -out:$*.dll \
-##WIN32##	  $(CLIBS) $(CGLUE) $(CRES) $(SLIB) $(WINLIBS)
+##WIN32##	  $(CLIBS) $(CGLUE) $(CRES) $(SLIB) $(WINLIBS) $(SCLIB)
 
 ##WIN32##$(PLIB): $(PDEF) $(PLIBS) $(PGLUE) $(PRES) $(CLIB) $(SLIB)
 ##WIN32##	link $(WINDLLFLAGS) -def:$(PDEF) -out:$*.dll \
@@ -108,73 +117,73 @@
 
 ##WIN32##$(KLIB): $(KDEF) $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS)
 ##WIN32##	link $(WINDLLFLAGS) -def:$(KDEF) -out:$*.dll \
-##WIN32##	  $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS) $(WINLIBS)
+##WIN32##	  $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS) $(WINLIBS) $(SCLIB)
 
 ##WIN32##$(GLIB): $(GDEF) $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB)
 ##WIN32##	link $(WINDLLFLAGS) -def:$(GDEF) -out:$*.dll \
-##WIN32##	  $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) $(WINLIBS)
+##WIN32##	  $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) $(WINLIBS) $(SCLIB)
 
 ##WIN32##$(K4LIB): $(K4DEF) $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB)
 ##WIN32##	link $(WINDLLFLAGS) -def:$(K4DEF) -out:$*.dll \
-##WIN32##	  $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS)
+##WIN32##	  $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS) $(SCLIB)
 
-$(K5_GLUE): win_glue.c
-	$(CC) $(ALL_CFLAGS) $(MITFLAGS) /c /DKRB5=1 /Fo$@ $**
-$(K4_GLUE): win_glue.c
-	$(CC) $(ALL_CFLAGS) /c /DKRB4=1 /Fo$@ $**
-$(GSS_GLUE): win_glue.c
-	$(CC) $(ALL_CFLAGS) /c /DGSSAPI=1 /Fo$@ $**
-$(COMERR_GLUE): win_glue.c
-	$(CC) $(ALL_CFLAGS) /c /DCOMERR=1 /Fo$@ $**
-$(PROF_GLUE): win_glue.c
-	$(CC) $(ALL_CFLAGS) /c /DPROFILELIB=1 /Fo$@ $**
-$(S_GLUE): win_glue.c
-	$(CC) $(ALL_CFLAGS) /c /DSUPPORTLIB=1 /Fo$@ $**
+##WIN32##$(K5_GLUE): win_glue.c
+##WIN32##	$(CC) $(ALL_CFLAGS) $(MITFLAGS) /c /DKRB5=1 /Fo$@ $**
+##WIN32##$(K4_GLUE): win_glue.c
+##WIN32##	$(CC) $(ALL_CFLAGS) /c /DKRB4=1 /Fo$@ $**
+##WIN32##$(GSS_GLUE): win_glue.c
+##WIN32##	$(CC) $(ALL_CFLAGS) /c /DGSSAPI=1 /Fo$@ $**
+##WIN32##$(COMERR_GLUE): win_glue.c
+##WIN32##	$(CC) $(ALL_CFLAGS) /c /DCOMERR=1 /Fo$@ $**
+##WIN32##$(PROF_GLUE): win_glue.c
+##WIN32##	$(CC) $(ALL_CFLAGS) /c /DPROFILELIB=1 /Fo$@ $**
+##WIN32##$(S_GLUE): win_glue.c
+##WIN32##	$(CC) $(ALL_CFLAGS) /c /DSUPPORTLIB=1 /Fo$@ $**
 
-# Build Convenience
-comerr.lib: $(CLIB)
-krb4.lib:   $(K4LIB)
-krb5.lib:   $(KLIB)
-gssapi.lib: $(GLIB)
-profile.lib: $(PLIB)
+##WIN32### Build Convenience
+##WIN32##comerr.lib: $(CLIB)
+##WIN32##krb4.lib:   $(K4LIB)
+##WIN32##krb5.lib:   $(KLIB)
+##WIN32##gssapi.lib: $(GLIB)
+##WIN32##profile.lib: $(PLIB)
 
-all-windows:: 
-	@echo Making in lib\crypto
-	cd crypto
-	$(MAKE) -$(MFLAGS)
-	@echo Making in lib\krb5
-	cd ..\krb5
-	$(MAKE) -$(MFLAGS)
-	@echo Making in lib\des425
-	cd ..\des425
-	$(MAKE) -$(MFLAGS) 
-	@echo Making in lib\krb4
-	cd ..\krb4
-	$(MAKE) -$(MFLAGS) 
-	@echo Making in lib\gssapi
-	cd ..\gssapi
-	$(MAKE) -$(MFLAGS) 
-	@echo Making in lib
-	cd ..
+##WIN32##all-windows:: 
+##WIN32##	@echo Making in lib\crypto
+##WIN32##	cd crypto
+##WIN32##	$(MAKE) -$(MFLAGS)
+##WIN32##	@echo Making in lib\krb5
+##WIN32##	cd ..\krb5
+##WIN32##	$(MAKE) -$(MFLAGS)
+##WIN32##	@echo Making in lib\des425
+##WIN32##	cd ..\des425
+##WIN32##	$(MAKE) -$(MFLAGS) 
+##WIN32##	@echo Making in lib\krb4
+##WIN32##	cd ..\krb4
+##WIN32##	$(MAKE) -$(MFLAGS) 
+##WIN32##	@echo Making in lib\gssapi
+##WIN32##	cd ..\gssapi
+##WIN32##	$(MAKE) -$(MFLAGS) 
+##WIN32##	@echo Making in lib
+##WIN32##	cd ..
 
-all-windows:: lib-windows
-lib-windows:: krb5.lib gssapi.lib krb4.lib 
+##WIN32##all-windows:: lib-windows
+##WIN32##lib-windows:: krb5.lib gssapi.lib krb4.lib 
 
-clean-windows::
-	@echo Making clean in lib\crypto
-	cd crypto
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in lib\krb5
-	cd ..\krb5
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in lib\des425
-	cd ..\des425
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in lib\krb4
-	cd ..\krb4
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in lib\gssapi
-	cd ..\gssapi
-	$(MAKE) -$(MFLAGS) clean
-	@echo Making clean in lib
-	cd ..
+##WIN32##clean-windows::
+##WIN32##	@echo Making clean in lib\crypto
+##WIN32##	cd crypto
+##WIN32##	$(MAKE) -$(MFLAGS) clean
+##WIN32##	@echo Making clean in lib\krb5
+##WIN32##	cd ..\krb5
+##WIN32##	$(MAKE) -$(MFLAGS) clean
+##WIN32##	@echo Making clean in lib\des425
+##WIN32##	cd ..\des425
+##WIN32##	$(MAKE) -$(MFLAGS) clean
+##WIN32##	@echo Making clean in lib\krb4
+##WIN32##	cd ..\krb4
+##WIN32##	$(MAKE) -$(MFLAGS) clean
+##WIN32##	@echo Making clean in lib\gssapi
+##WIN32##	cd ..\gssapi
+##WIN32##	$(MAKE) -$(MFLAGS) clean
+##WIN32##	@echo Making clean in lib
+##WIN32##	cd ..
Index: src/lib/ChangeLog
===================================================================
--- src/lib/ChangeLog	(revision 17679)
+++ src/lib/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2005-10-31  Jeffrey Altman <jaltman@mit.edu>
 
 	* gssapi32.def:  export missing functions
Index: src/lib/krb5/os/ChangeLog
===================================================================
--- src/lib/krb5/os/ChangeLog	(revision 17679)
+++ src/lib/krb5/os/ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* gmt_mktime.c, read_pwd.c: changes to support 64-bit builds
+          on Windows
+
 2005-11-14  Jeffrey Altman <jaltman@mit.edu>
 
 	* toffset.c:  (krb5_set_real_time, krb5_set_debugging_time, 
Index: src/lib/krb5/os/read_pwd.c
===================================================================
--- src/lib/krb5/os/read_pwd.c	(revision 17679)
+++ src/lib/krb5/os/read_pwd.c	(working copy)
@@ -209,7 +209,7 @@
     switch(msg) {
     case WM_INITDIALOG:
 	dp = (pwd_params *) lParam;
-	SetWindowLong(hdlg, DWL_USER, lParam);
+	SetWindowLongPtr(hdlg, DWLP_USER, lParam);
 	SetDlgItemText(hdlg, ID_READ_PWD_PROMPT, dp->pwd_prompt);
 	SetDlgItemText(hdlg, ID_READ_PWD_PROMPT2, dp->pwd_prompt2);
 	SetDlgItemText(hdlg, ID_READ_PWD_PWD, "");
@@ -217,7 +217,7 @@
 	return TRUE;
 
     case WM_COMMAND:
-	dp = (pwd_params *) GetWindowLong(hdlg, DWL_USER);
+	dp = (pwd_params *) GetWindowLongPtr(hdlg, DWLP_USER);
         switch (wParam) {
 	case IDOK:
 	    *(dp->pwd_size_return) =
Index: src/krb524/Makefile.in
===================================================================
--- src/krb524/Makefile.in	(revision 17679)
+++ src/krb524/Makefile.in	(working copy)
@@ -89,7 +89,7 @@
 	link $(DLL_LINKOPTS) -def:$(K524DEF) -out:$*.dll $** $(WINLIBS)
 
 $(OUTPRE)k524init.exe: $(OUTPRE)k524init.$(OBJEXT) $(KLIB) $(K4LIB) $(CLIB) $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib
-	link $(EXE_LINKOPTS) -out:$@ $** $(WINLIBS)
+	link $(EXE_LINKOPTS) -out:$@ $** $(WINLIBS) $(SCLIB)
 
 install-unix::
 	$(INSTALL_PROGRAM) krb524d $(DESTDIR)$(SERVER_BINDIR)/krb524d
Index: src/krb524/ChangeLog
===================================================================
--- src/krb524/ChangeLog	(revision 17679)
+++ src/krb524/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2005-11-17  Ken Raeburn  <raeburn@mit.edu>
 
 	* krb524d.c: Include k5-int.h instead of krb5.h.
Index: src/util/windows/Makefile.in
===================================================================
--- src/util/windows/Makefile.in	(revision 17679)
+++ src/util/windows/Makefile.in	(working copy)
@@ -3,7 +3,7 @@
 all-windows:: $(OUTPRE)libecho.exe $(OUTPRE)getopt.lib
 
 $(OUTPRE)libecho.exe: $(OUTPRE)libecho.obj
-	link -out:$@ $**
+	link -out:$@ $** $(SCLIB)
 
 $(OUTPRE)getopt.lib: $(OUTPRE)getopt.obj $(OUTPRE)getopt_long.obj
 	lib -out:$@ $**
Index: src/util/windows/ChangeLog
===================================================================
--- src/util/windows/ChangeLog	(revision 17679)
+++ src/util/windows/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2000-02-04  Danilo Almeida  <dalmeida@mit.edu>
 
 	* getopt.c, getopt_long.c, getopt.h: Update to latest BSD code
Index: src/util/support/Makefile.in
===================================================================
--- src/util/support/Makefile.in	(revision 17679)
+++ src/util/support/Makefile.in	(working copy)
@@ -6,8 +6,10 @@
 
 ##DOS##BUILDTOP = ..\..
 ##DOS##LIBNAME=$(OUTPRE)k5sprt32.lib
+##DOS##WIN64LIBNAME=$(OUTPRE)k5sprt64.lib
 ##DOS##XTRA=
 ##DOS##OBJFILE=$(OUTPRE)k5sprt32.lst
+##DOS##WIN64OBJFILE=$(OUTPRE)k5sprt64.lst
 
 SED = sed
 
Index: src/util/support/ChangeLog
===================================================================
--- src/util/support/ChangeLog	(revision 17679)
+++ src/util/support/ChangeLog	(working copy)
@@ -1,3 +1,7 @@
+2006-02-24  Jeffrey Altman <jaltman@mit.edu>
+
+ 	* Makefile.in: support for 64-bit Windows builds
+
 2006-01-25  Ken Raeburn  <raeburn@mit.edu>
 
 	* threads.c (krb5int_mutex_alloc, krb5int_mutex_free,