Qing Dong <dongq@mit.edu> provided a set of changes to allow

krb5 to build under the Microsoft Visual Studio 8 compiler 
in 64-bit mode and produce file names that do not conflict 
with the names produced by the 32-bit build.  That patch 
was modified to work on Unix and also include processor
dependent pre-processor definitions to remove warnings.

ticket: 3415
tags: pullup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17680 dc483132-0cff-0310-8789-dd5450dbe970

4 files changed, 130 insertions, 112 deletions

diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog
index cdbd1d1df1..d7d57ee922 100644
--- a/src/lib/ChangeLog
+++ b/src/lib/ChangeLog
@@ -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
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 3e34ef0ef5..736f9a5156 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -28,45 +28,54 @@ clean-windows::
 ##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
-
-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
-
-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##!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
+
+
+##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
+
+
+
+##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)
@@ -91,16 +100,16 @@ RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY
 
 ##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 @@ $(SDEF): ..\util\support\libkrb5support.exports
 
 ##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)
-
-$(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$@ $**
-
-# Build Convenience
-comerr.lib: $(CLIB)
-krb4.lib:   $(K4LIB)
-krb5.lib:   $(KLIB)
-gssapi.lib: $(GLIB)
-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 ..
-
-all-windows:: lib-windows
-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##	  $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS) $(SCLIB)
+
+##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$@ $**
+
+##WIN32### Build Convenience
+##WIN32##comerr.lib: $(CLIB)
+##WIN32##krb4.lib:   $(K4LIB)
+##WIN32##krb5.lib:   $(KLIB)
+##WIN32##gssapi.lib: $(GLIB)
+##WIN32##profile.lib: $(PLIB)
+
+##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 ..
+
+##WIN32##all-windows:: lib-windows
+##WIN32##lib-windows:: krb5.lib gssapi.lib krb4.lib 
+
+##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 ..
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 6e35592cb0..d9bda00a64 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -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, 
diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 0e3d53ef99..6f2868da7c 100644
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -209,7 +209,7 @@ read_pwd_proc(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
     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 @@ read_pwd_proc(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 	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) =