From 5d97609b2b69d405b30560f12ae0ad5b7e4bafe8 Mon Sep 17 00:00:00 2001
From: Theodore Tso <tytso@mit.edu>
Date: Sat, 5 Dec 1998 06:22:37 +0000
Subject: [PATCH] Makefile.in, ccdefops.c: Temporarily back out the ccapi
 ccache under 	Windows so we can make sure the rest of the krb5 tree builds
 correctly 	under Windows.  (Note: I didn't revert
 lib/krb5/os/ccdefname.c, so 	setting KRB5_CC_NAME to FILE:C:\tmp\tkt is
 required to make things 	work.)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11080 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/krb5/ccache/ChangeLog   |  8 ++++++++
 src/lib/krb5/ccache/Makefile.in | 22 ++++++++++++++--------
 src/lib/krb5/ccache/ccdefops.c  |  2 +-
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 71aa06dc8..7c12c48aa 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,11 @@
+Sat Dec  5 01:20:31 1998  Theodore Y. Ts'o  <tytso@mit.edu>
+
+	* Makefile.in, ccdefops.c: Temporarily back out the ccapi ccache
+		under Windows so we can make sure the rest of the krb5
+		tree builds correctly under Windows.  (Note: I didn't
+		revert lib/krb5/os/ccdefname.c, so setting KRB5_CC_NAME to
+		FILE:C:\tmp\tkt is required to make things work.)
+
 1998-08-24  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Add windows build instructions to build CCache API
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 9d375cd64..5bf416dc7 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -34,7 +34,7 @@ all-unix:: all-libobjs
 
 all-windows:: subdirs $(OBJFILE) 
 
-##DOSsubdirs:: file\file.lst memory\file.lst ccapi\file.lst
+##DOSsubdirs:: file\file.lst memory\file.lst # ccapi\file.lst
 ##DOS
 ##DOSfile\file.lst::
 ##DOS	cd file
@@ -48,17 +48,23 @@ all-windows:: subdirs $(OBJFILE)
 ##DOS	-$(MAKE) -$(MFLAGS)
 ##DOS	cd ..
 
-##DOSccapi\file.lst::
-##DOS	cd ccapi
-##DOS	@echo Making in krb5\ccache\ccapi
-##DOS	-$(MAKE) -$(MFLAGS)
-##DOS	cd ..
+# ##DOSccapi\file.lst::
+# ##DOS	cd ccapi
+# ##DOS	@echo Making in krb5\ccache\ccapi
+# ##DOS	-$(MAKE) -$(MFLAGS)
+# ##DOS	cd ..
+
+# ##DOS$(OBJFILE): $(OBJS) file\file.lst memory\file.lst ccapi\file.lst
+# ##DOS	$(RM) $(OBJFILE)
+# ##WIN16##	$(CP) nul: $(OBJFILE)
+# ##WIN32##	$(LIBECHO) -p $(PREFIXDIR)\ *.obj file\*.obj memory\*.obj \
+# ##WIN32##		ccapi\*.obj > $(OBJFILE)
 
-##DOS$(OBJFILE): $(OBJS) file\file.lst memory\file.lst ccapi\file.lst
+##DOS$(OBJFILE): $(OBJS) file\file.lst memory\file.lst 
 ##DOS	$(RM) $(OBJFILE)
 ##WIN16##	$(CP) nul: $(OBJFILE)
 ##WIN32##	$(LIBECHO) -p $(PREFIXDIR)\ *.obj file\*.obj memory\*.obj \
-##WIN32##		ccapi\*.obj > $(OBJFILE)
+##WIN32##		> $(OBJFILE)
 
 clean-unix:: clean-libobjs
 
diff --git a/src/lib/krb5/ccache/ccdefops.c b/src/lib/krb5/ccache/ccdefops.c
index 9c39f40f5..cc2b63fa2 100644
--- a/src/lib/krb5/ccache/ccdefops.c
+++ b/src/lib/krb5/ccache/ccdefops.c
@@ -27,7 +27,7 @@
 
 #include "k5-int.h"
 
-#if defined(macintosh) || defined(_MSDOS) || defined(_WIN32)
+#if defined(macintosh) /* || defined(_MSDOS) || defined(_WIN32) */
 
 /* Macs and PCs use the shared, memory based credentials cache */
 #include "stdcc.h" /* from ccapi subdir */
-- 
2.26.2