aboutsummaryrefslogtreecommitdiff
path: root/src/appl
diff options
context:
space:
mode:
authorJeffrey Altman <jaltman@secure-endpoints.com>2006-02-27 19:22:08 +0000
committerJeffrey Altman <jaltman@secure-endpoints.com>2006-02-27 19:22:08 +0000
commitc53f7fd2ca7d605397091294683eaf63d6b922f2 (patch)
treefab7fe52977a865d764581becde0e1e052742667 /src/appl
parent3859c1100296dfba406107fcdf23fc30da385181 (diff)
downloadkrb5-c53f7fd2ca7d605397091294683eaf63d6b922f2.zip
krb5-c53f7fd2ca7d605397091294683eaf63d6b922f2.tar.gz
krb5-c53f7fd2ca7d605397091294683eaf63d6b922f2.tar.bz2
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
Diffstat (limited to 'src/appl')
-rw-r--r--src/appl/gss-sample/ChangeLog4
-rw-r--r--src/appl/gss-sample/Makefile.in4
-rw-r--r--src/appl/gssftp/ftp/ChangeLog4
-rw-r--r--src/appl/gssftp/ftp/Makefile.in2
4 files changed, 11 insertions, 3 deletions
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index 15f6745..07ec1f6 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -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.
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index ab6821c..97d1d89 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -20,10 +20,10 @@ gss-client: gss-client.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
$(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
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 1f17c0f..e043f10 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -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
diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index 9e15dc6..9355f7c 100644
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -37,7 +37,7 @@ ftp: $(OBJS) $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
$(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