Danilo also says we can get rid of _MSDOS (Win16) tests, and explicit FAR/NEAR specs

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

6 files changed, 14 insertions, 9 deletions

diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog
index 24d04add10..973583a7f0 100644
--- a/src/lib/krb5/ccache/ccapi/ChangeLog
+++ b/src/lib/krb5/ccache/ccapi/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* stdcc.c, stdcc.h, stdcc_util.c, stdcc_util.h, winccld.c: Delete
+	_MSDOS support.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* stdcc.h, winccld.c: Don't use KRB5_DLLIMP.
diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c
index b39dce9fef..9899cb706e 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc.c
@@ -36,7 +36,7 @@
 
 apiCB *gCntrlBlock = NULL;
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #include "winccld.h"	
 #endif
 
@@ -45,7 +45,7 @@ apiCB *gCntrlBlock = NULL;
 #endif
 
 #ifdef DEBUG
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #include <io.h>
 #define SHOW_DEBUG(buf)   MessageBox((HWND)NULL, (buf), "ccapi debug", MB_OK)
 #endif
@@ -79,7 +79,7 @@ krb5_cc_ops krb5_cc_stdcc_ops = {
       krb5_stdcc_set_flags,
 };
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 /*
  * cache_changed be called after the cache changes.
  * A notification message is is posted out to all top level
@@ -96,13 +96,13 @@ void cache_changed()
 
 	PostMessage(HWND_BROADCAST, message, 0, 0);
 }
-#else /* _MSDOS || _WIN32 */
+#else /* _WIN32 */
 
 void cache_changed()
 {
 	return;
 }
-#endif /* _MSDOS || _WIN32 */
+#endif /* _WIN32 */
 
 struct err_xlate
 {
diff --git a/src/lib/krb5/ccache/ccapi/stdcc.h b/src/lib/krb5/ccache/ccapi/stdcc.h
index 7322c199ee..e2d1131688 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc.h
@@ -5,7 +5,7 @@
 #include "CCache2.h"
 #endif
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #include "cacheapi.h"
 #endif
 
diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.c b/src/lib/krb5/ccache/ccapi/stdcc_util.c
index fb0150657b..b9bc56ab42 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc_util.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc_util.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #include <malloc.h>
 #endif
 
diff --git a/src/lib/krb5/ccache/ccapi/stdcc_util.h b/src/lib/krb5/ccache/ccapi/stdcc_util.h
index 7d3bc93f90..30d9cafd46 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc_util.h
+++ b/src/lib/krb5/ccache/ccapi/stdcc_util.h
@@ -7,7 +7,7 @@
 #include "CCache2.h"
 #endif
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #include "cacheapi.h"
 #endif
 
diff --git a/src/lib/krb5/ccache/ccapi/winccld.c b/src/lib/krb5/ccache/ccapi/winccld.c
index 22489c10de..39d8f12278 100644
--- a/src/lib/krb5/ccache/ccapi/winccld.c
+++ b/src/lib/krb5/ccache/ccapi/winccld.c
@@ -1,4 +1,4 @@
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 /*
  * winccld.c --- routine for dynamically loading the ccache DLL if
  * it's present.