--- trunk\src\config\win-pre.in Tue Jan 24 20:49:36 2006 +++ c:\pismere\athena\auth\krb5\src\config\win-pre.in Mon Jan 23 19:42:17 2006 @@ -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 @@ -130,6 +130,16 @@ 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 +153,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 @@ -177,6 +187,17 @@ SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt32.lib 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 --- trunk\src\config\win-post.in Tue Jan 24 20:49:36 2006 +++ c:\pismere\athena\auth\krb5\src\config\win-post.in Mon Jan 23 21:49:16 2006 @@ -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) --- trunk\src\Makefile.in Tue Jan 24 20:51:47 2006 +++ c:\pismere\athena\auth\krb5\src\Makefile.in Tue Jan 10 18:17:01 2006 @@ -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 --- trunk\src\windows\cns\Makefile.in Tue Jan 24 20:47:51 2006 +++ c:\pismere\athena\auth\krb5\src\windows\cns\Makefile.in Fri Jan 20 16:44:09 2006 @@ -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) --- trunk\src\windows\cns\password.c Tue Jan 24 20:47:51 2006 +++ c:\pismere\athena\auth\krb5\src\windows\cns\password.c Fri Jan 20 16:40:54 2006 @@ -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; } --- trunk\src\windows\kfwlogon\Makefile.in Tue Jan 24 20:47:53 2006 +++ c:\pismere\athena\auth\krb5\src\windows\kfwlogon\Makefile.in Fri Jan 20 17:04:09 2006 @@ -23,10 +23,10 @@ $(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) + 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) + link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) install:: copy $(OUTPRE)kfwlogon.dll $(DESTDIR) --- trunk\src\windows\identity\plugins\krb4\Makefile Tue Jan 24 20:47:59 2006 +++ c:\pismere\athena\auth\krb5\src\windows\identity\plugins\krb4\Makefile Tue Jan 24 22:34:02 2006 @@ -40,11 +40,21 @@ $(OBJ)\krb4configdlg.obj \ $(OBJ)\krb4newcreds.obj + + +SDKLIBFILES= + +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +SCLIB=bufferoverflowu.lib +LIBFILES= \ + $(LIBDIR)\nidmgr64.lib \ + $(KFWLIBDIR)\loadfuncs.lib +!else +SCLIB= LIBFILES= \ $(LIBDIR)\nidmgr32.lib \ $(KFWLIBDIR)\loadfuncs.lib - -SDKLIBFILES= +!endif VERRESFILE=$(OBJ)\version.res @@ -52,7 +62,7 @@ $(CCSV) $** $@ $(DLLFILE): $(OBJFILES) $(VERRESFILE) - $(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES) + $(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES) $(SCLIB) all: mkdirs $(DLLFILE) lang --- trunk\src\windows\identity\plugins\krb5\Makefile Tue Jan 24 20:48:02 2006 +++ c:\pismere\athena\auth\krb5\src\windows\identity\plugins\krb5\Makefile Tue Jan 24 23:35:33 2006 @@ -46,15 +46,25 @@ $(OBJ)\krb5configid.obj \ $(OBJ)\krb5configids.obj -LIBFILES= \ - $(LIBDIR)\nidmgr32.lib \ - $(KFWLIBDIR)\loadfuncs.lib + SDKLIBFILES= \ netapi32.lib \ shlwapi.lib \ comctl32.lib +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +SCLIB=bufferoverflowu.lib +LIBFILES= \ + $(LIBDIR)\nidmgr64.lib \ + $(KFWLIBDIR)\loadfuncs.lib +!else +SCLIB= +LIBFILES= \ + $(LIBDIR)\nidmgr32.lib \ + $(KFWLIBDIR)\loadfuncs.lib +!endif + MSGRESFILE=$(OBJ)\krb5_msgs.res VERRESFILE=$(OBJ)\version.res @@ -62,15 +72,15 @@ $(OBJ)\krb5config.c: krbconfig.csv $(CONFDIR)\csvschema.cfg $(CCSV) $** $@ -$(DLLFILE): $(MSGRESFILE) $(VERRESFILE) $(OBJFILES) - $(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES) +$(DLLFILE): $(OBJFILES) $(VERRESFILE) + $(DLLGUILINK) $(MSGRESFILE) $(LIBFILES) $(SDKLIBFILES) $(SCLIB) $(MSGRESFILE): $(OBJ)\krb5_msgs.rc $(OBJ)\krb5_msgs.rc: lang\krb5_msgs.mc $(MC2RC) -all: mkdirs $(DLLFILE) lang +all: mkdirs $(MSGRESFILE) $(DLLFILE) lang lang:: --- trunk\src\windows\identity\plugins\krb5\krb5configdlg.c Tue Jan 24 20:48:02 2006 +++ c:\pismere\athena\auth\krb5\src\windows\identity\plugins\krb5\krb5configdlg.c Mon Jan 23 18:37:30 2006 @@ -1466,7 +1466,7 @@ if (pdisp->item.iItem == -1 || lvi.lParam != -1) { - SetWindowLongPtr(hwnd, DWL_MSGRESULT, TRUE); + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, TRUE); } else { /* allow editing */ HWND hw_edit; @@ -1478,7 +1478,7 @@ K5_MAXCCH_REALM - 1, 0); } - SetWindowLongPtr(hwnd, DWL_MSGRESULT, FALSE); + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, FALSE); } return TRUE; @@ -1571,7 +1571,7 @@ if (pdisp->item.iItem == -1 || lvi.lParam != -1) { - SetWindowLongPtr(hwnd, DWL_MSGRESULT, TRUE); + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, TRUE); } else { /* allow editing */ HWND hw_edit; @@ -1583,7 +1583,7 @@ K5_MAXCCH_HOST - 1, 0); } - SetWindowLongPtr(hwnd, DWL_MSGRESULT, FALSE); + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, FALSE); } return TRUE; } @@ -1603,7 +1603,7 @@ k = d->realms[r].n_kdcs; if (k >= K5_MAX_KDC) { - SetWindowLongPtr(hwnd, DWL_MSGRESULT, FALSE); + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, FALSE); /* TODO: show a message box saying there are too many KDC's already. */ --- trunk\src\windows\identity\nidmgrdll\Makefile Tue Jan 24 20:48:20 2006 +++ c:\pismere\athena\auth\krb5\src\windows\identity\nidmgrdll\Makefile Tue Jan 24 19:35:44 2006 @@ -25,9 +25,13 @@ MODULE=nidmgrdll !include <../config/Makefile.w32> +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +DLLFILE=$(BINDIR)\nidmgr64.dll +LIBFILE=$(LIBDIR)\nidmgr64.lib +!else DLLFILE=$(BINDIR)\nidmgr32.dll - LIBFILE=$(LIBDIR)\nidmgr32.lib +!endif UTILDIR=$(OBJDIR)\util @@ -101,8 +105,14 @@ shlwapi.lib \ version.lib +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +SCLIB=bufferoverflowu.lib +!else +SCLIB= +!endif + $(DLLFILE): $(OBJFILES) $(RESFILES) - $(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES) + $(DLLGUILINK) $(LIBFILES) $(SDKLIBFILES) $(SCLIB) all: mkdirs $(DLLFILE) --- trunk\src\windows\identity\ui\configwnd.c Tue Jan 24 20:48:27 2006 +++ c:\pismere\athena\auth\krb5\src\windows\identity\ui\configwnd.c Mon Jan 23 17:51:17 2006 @@ -512,7 +512,7 @@ r_fill.bottom = r_logo.top; FillRect(hdc, &r_fill, d->hbr_white); - SetWindowLong(hwnd, DWL_MSGRESULT, (LONG) TRUE); + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, (LONG) TRUE); } return TRUE; } --- trunk\src\windows\identity\ui\Makefile Tue Jan 24 20:48:28 2006 +++ c:\pismere\athena\auth\krb5\src\windows\identity\ui\Makefile Tue Jan 24 19:45:19 2006 @@ -57,8 +57,11 @@ $(OBJ)\khapp.res \ $(OBJ)\appver.res -LIBFILES= \ - $(LIBDIR)\nidmgr32.lib +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +LIBFILES=$(LIBDIR)\nidmgr64.lib +!else +LIBFILES=$(LIBDIR)\nidmgr32.lib +!endif SDKLIBFILES= \ comctl32.lib \ @@ -83,8 +86,15 @@ !endif $(CP) $** $@ + +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +SCLIB=bufferoverflowu.lib +!else +SCLIB= +!endif + $(EXEFILE): $(OBJFILES) $(RESFILES) $(LIBFILES) - $(EXEGUILINK) $(SDKLIBFILES) + $(EXEGUILINK) $(SDKLIBFILES) $(SCLIB) all: mkdirs $(EXEFILE) $(MANIFESTFILE) --- trunk\src\windows\identity\ui\mainwnd.c Tue Jan 24 20:48:28 2006 +++ c:\pismere\athena\auth\krb5\src\windows\identity\ui\mainwnd.c Mon Jan 23 17:47:41 2006 @@ -43,7 +43,7 @@ khm_set_dialog_result(HWND hwnd, LRESULT lr) { #pragma warning(push) #pragma warning(disable: 4244) - SetWindowLongPtr(hwnd, DWL_MSGRESULT, lr); + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, lr); #pragma warning(pop) } --- trunk\src\windows\identity\Makefile Tue Jan 24 20:48:30 2006 +++ c:\pismere\athena\auth\krb5\src\windows\identity\Makefile Fri Jan 20 17:27:06 2006 @@ -33,7 +33,7 @@ !ifndef CLEANRUN !ifndef TESTRUN !ifndef ETAGRUN -RMAKE=$(MAKECMD) /nologo all +RMAKE=$(MAKECMD) /nologo all KH_NO_WX=1 !else RMAKE=$(MAKECMD) /nologo etag !endif --- trunk\src\windows\wintel\Makefile.in Tue Jan 24 20:47:48 2006 +++ c:\pismere\athena\auth\krb5\src\windows\wintel\Makefile.in Fri Jan 20 16:46:15 2006 @@ -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) --- trunk\src\windows\gina\Makefile.in Tue Jan 24 20:48:36 2006 +++ c:\pismere\athena\auth\krb5\src\windows\gina\Makefile.in Fri Jan 20 17:00:50 2006 @@ -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 --- trunk\src\appl\gssftp\ftp\Makefile.in Tue Jan 24 20:48:41 2006 +++ c:\pismere\athena\auth\krb5\src\appl\gssftp\ftp\Makefile.in Mon Jan 23 21:54:20 2006 @@ -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 --- trunk\src\appl\gss-sample\Makefile.in Tue Jan 24 20:48:49 2006 +++ c:\pismere\athena\auth\krb5\src\appl\gss-sample\Makefile.in Mon Jan 23 21:53:23 2006 @@ -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 --- trunk\src\clients\klist\Makefile.in Tue Jan 24 20:49:06 2006 +++ c:\pismere\athena\auth\krb5\src\clients\klist\Makefile.in Mon Jan 23 21:40:23 2006 @@ -15,7 +15,7 @@ $(CC_LINK) -o $@ klist.o $(KRB4COMPAT_LIBS) $(OUTPRE)klist.exe: $(OUTPRE)klist.obj $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib $(SLIB) $(KLIB) $(CLIB) - link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib + link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB) clean-unix:: $(RM) klist.o klist --- trunk\src\clients\kpasswd\Makefile.in Tue Jan 24 20:49:07 2006 +++ c:\pismere\athena\auth\krb5\src\clients\kpasswd\Makefile.in Mon Jan 23 21:50:51 2006 @@ -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) --- trunk\src\lib\Makefile.in Tue Jan 24 20:51:25 2006 +++ c:\pismere\athena\auth\krb5\src\lib\Makefile.in Mon Jan 23 21:32:42 2006 @@ -28,6 +28,8 @@ ##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 @@ -37,6 +39,10 @@ GLIBS = gssapi\$(OUTPRE)gssapi.lib K4LIBS = krb4\$(OUTPRE)krb4.lib +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)k5sprt64.lib +!endif + SDEF = k5sprt32.def CDEF = comerr32.def PDEF = xpprof32.def @@ -44,6 +50,8 @@ GDEF = gssapi32.def K4DEF = krb4_32.def + + KRB5RC = krb5.rc VERSIONRC = $(BUILDTOP)\windows\version.rc @@ -91,7 +99,7 @@ ##WIN32##$(SLIB): $(SDEF) $(SLIBS) $(SGLUE) $(SRES) ##WIN32## link $(WINDLLFLAGS) -def:$(SDEF) -out:$*.dll \ -##WIN32## $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS) +##WIN32## $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS) $(SCLIB) $(SDEF): ..\util\support\libkrb5support.exports echo EXPORTS > $(SDEF).new type ..\util\support\libkrb5support.exports >> $(SDEF).new @@ -100,7 +108,7 @@ ##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,15 +116,15 @@ ##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$@ $** --- trunk\src\lib\krb5\os\read_pwd.c Tue Jan 24 20:51:06 2006 +++ c:\pismere\athena\auth\krb5\src\lib\krb5/os/read_pwd.c Thu Jan 19 20:51:53 2006 @@ -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) = --- trunk\src\krb524\Makefile.in Tue Jan 24 20:51:28 2006 +++ c:\pismere\athena\auth\krb5\src\krb524\Makefile.in Tue Jan 24 19:22:57 2006 @@ -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 --- trunk\src\util\windows\Makefile.in Tue Jan 24 20:51:33 2006 +++ c:\pismere\athena\auth\krb5\src\util\windows\Makefile.in Wed Jan 18 19:06:22 2006 @@ -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:$@ $** --- trunk\src\util\support\Makefile.in Tue Jan 24 20:51:45 2006 +++ c:\pismere\athena\auth\krb5\src\util\support\Makefile.in Thu Jan 19 21:12:36 2006 @@ -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 --- trunk\src\windows\Makefile.in Tue Jan 24 20:48:37 2006 +++ c:\pismere\athena\auth\krb5\src\windows\Makefile.in Wed Jan 25 00:34:01 2006 @@ -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)