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

93 files changed, 389 insertions, 499 deletions

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 227c13cbc..2cbf9bd34 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* krb5_libinit.c: Drop _MSDOS support.
+
 2001-09-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (SRCS): Use $(srcdir) not $(subdir).
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index d76e2a774..227af04cb 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* cc_file.c, cc_stdio.c: Delete _MSDOS (win16) support.
+
+	* cc_memory.c, ccbase.c, ccdefault.c, ccfns.c: Don't explicitly
+	declare pointers FAR any more.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* cc_file.c, ccbase.c, cccopy.c, ccdefault.c, fcc.h, ser_cc.c:
diff --git a/src/lib/krb5/ccache/cc_file.c b/src/lib/krb5/ccache/cc_file.c
index e389a481a..233430702 100644
--- a/src/lib/krb5/ccache/cc_file.c
+++ b/src/lib/krb5/ccache/cc_file.c
@@ -474,12 +474,8 @@ krb5_fcc_read_keyblock(context, id, keyblock)
 
      kret = krb5_fcc_read_int32(context, id, &int32);
      CHECK(kret);
-#if defined(_MSDOS)
-     int32 &= VALID_INT_BITS;    /* Gradient does not write  correctly */     
-#else
      if ((int32 & VALID_INT_BITS) != int32)     /* Overflow size_t??? */
 	  return KRB5_CC_NOMEM;
-#endif
      keyblock->length = (int) int32;
      if ( keyblock->length == 0 )
 	     return KRB5_OK;
@@ -513,12 +509,8 @@ krb5_fcc_read_data(context, id, data)
 
      kret = krb5_fcc_read_int32(context, id, &len);
      CHECK(kret);
-#if defined(_MSDOS)
-     len &= VALID_INT_BITS;
-#else
      if ((len & VALID_INT_BITS) != len)
         return KRB5_CC_NOMEM;
-#endif
      data->length = (int) len;
 
      if (data->length == 0) {
@@ -560,12 +552,8 @@ krb5_fcc_read_addr(context, id, addr)
      
      kret = krb5_fcc_read_int32(context, id, &int32);
      CHECK(kret);
-#if defined(_MSDOS)
-     int32 &= VALID_INT_BITS;	/* Gradient DCE does this wrong */
-#else
      if ((int32 & VALID_INT_BITS) != int32)     /* Overflow int??? */
 	  return KRB5_CC_NOMEM;
-#endif
      addr->length = (int) int32;
 
      if (addr->length == 0)
@@ -743,12 +731,8 @@ krb5_fcc_read_authdatum(context, id, a)
     a->ad_type = (krb5_authdatatype)ui2;
     kret = krb5_fcc_read_int32(context, id, &int32);
     CHECK(kret);
-#ifdef _MSDOS
-    int32 &= VALID_INT_BITS;
-#else
     if ((int32 & VALID_INT_BITS) != int32)     /* Overflow int??? */
           return KRB5_CC_NOMEM;
-#endif
     a->length = (int) int32;
     
     if (a->length == 0 )
@@ -2085,7 +2069,7 @@ krb5_cc_ops krb5_fcc_ops = {
      krb5_fcc_set_flags,
 };
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 
 /*
  * krb5_change_cache should be called after the cache changes.
@@ -2112,7 +2096,7 @@ krb5_get_notification_message (void) {
 
     return message;
 }
-#else /* _MSDOS || _WIN32 */
+#else /* _WIN32 */
 
 krb5_error_code
 krb5_change_cache () 
@@ -2125,7 +2109,7 @@ krb5_get_notification_message ()
     return 0;
 }
 
-#endif /* _MSDOS || _WIN32 */
+#endif /* _WIN32 */
 
 krb5_cc_ops krb5_cc_file_ops = {
      0,
diff --git a/src/lib/krb5/ccache/cc_memory.c b/src/lib/krb5/ccache/cc_memory.c
index 04b290aa9..9979a3b42 100644
--- a/src/lib/krb5/ccache/cc_memory.c
+++ b/src/lib/krb5/ccache/cc_memory.c
@@ -88,7 +88,7 @@ krb5_error_code krb5_change_cache PROTOTYPE(());
 typedef struct _krb5_mcc_link {
      struct _krb5_mcc_link *next;
      krb5_creds *creds;
-} krb5_mcc_link, FAR *krb5_mcc_cursor;
+} krb5_mcc_link, *krb5_mcc_cursor;
 
 typedef struct _krb5_mcc_data {
      struct _krb5_mcc_data *next;
@@ -97,7 +97,7 @@ typedef struct _krb5_mcc_data {
      krb5_mcc_cursor link;
 } krb5_mcc_data;
 
-static krb5_mcc_data FAR *mcc_head = 0;
+static krb5_mcc_data *mcc_head = 0;
 
 /*
  * Modifies:
diff --git a/src/lib/krb5/ccache/cc_stdio.c b/src/lib/krb5/ccache/cc_stdio.c
index f46e5d649..4b8291946 100644
--- a/src/lib/krb5/ccache/cc_stdio.c
+++ b/src/lib/krb5/ccache/cc_stdio.c
@@ -517,12 +517,8 @@ krb5_scc_read_keyblock(context, id, keyblock)
 
      kret = krb5_scc_read_int32(context, id, &int32);
      CHECK(kret);
-#ifdef _MSDOS
-     int32 &= VALID_INT_BITS;    /* Gradient does not write  correctly */     
-#else
      if ((int32 & VALID_INT_BITS) != int32)     /* Overflow size_t??? */
 	  return KRB5_CC_NOMEM;
-#endif
      keyblock->length = int32;
      if ( keyblock->length == 0 )
 	     return KRB5_OK;
@@ -556,12 +552,8 @@ krb5_scc_read_data(context, id, data)
 
      kret = krb5_scc_read_int32(context, id, &len);
      CHECK(kret);
-#ifdef _MSDOS
-     len &= VALID_INT_BITS;
-#else
      if ((len & VALID_INT_BITS) != len)
         return KRB5_CC_NOMEM;
-#endif
      data->length = (int) len;
 
      if (data->length == 0) {
@@ -603,12 +595,8 @@ krb5_scc_read_addr(context, id, addr)
      
      kret = krb5_scc_read_int32(context, id, &int32);
      CHECK(kret);
-#ifdef _MSDOS
-     int32 &= VALID_INT_BITS;	/* Gradient DCE does this wrong */
-#else
      if ((int32 & VALID_INT_BITS) != int32)     /* Overflow int??? */
 	  return KRB5_CC_NOMEM;
-#endif
      addr->length = int32;
 
      if (addr->length == 0)
@@ -779,12 +767,8 @@ krb5_scc_read_authdatum(context, id, a)
     a->ad_type = (krb5_authdatatype)ui2;
     kret = krb5_scc_read_int32(context, id, &int32);
     CHECK(kret);
-#ifdef _MSDOS
-    int32 &= VALID_INT_BITS;
-#else
     if ((int32 & VALID_INT_BITS) != int32)     /* Overflow int??? */
           return KRB5_CC_NOMEM;
-#endif
     a->length = int32;
     
     if (a->length == 0 )
@@ -1896,7 +1880,7 @@ krb5_scc_generate_new (context, id)
      strcpy(((krb5_scc_data *) lid->data)->filename, scratch);
 
      /* Make sure the file name is useable */
-#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
+#if defined(__STDC__) || defined(_WIN32)
      f = fopen (((krb5_scc_data *) lid->data)->filename, "wb+");
 #else
      f = fopen (((krb5_scc_data *) lid->data)->filename, "w+");
diff --git a/src/lib/krb5/ccache/ccapi/ChangeLog b/src/lib/krb5/ccache/ccapi/ChangeLog
index 24d04add1..973583a7f 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 b39dce9fe..9899cb706 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 7322c199e..e2d113168 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 fb0150657..b9bc56ab4 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 7d3bc93f9..30d9cafd4 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 22489c10d..39d8f1227 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.
diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index 18832e398..7c15d5070 100644
--- a/src/lib/krb5/ccache/ccbase.c
+++ b/src/lib/krb5/ccache/ccbase.c
@@ -48,7 +48,7 @@ static struct krb5_cc_typelist *cc_typehead = &cc_entry;
 krb5_error_code KRB5_CALLCONV
 krb5_cc_register(context, ops, override)
    krb5_context context;
-   krb5_cc_ops FAR *ops;
+   krb5_cc_ops *ops;
    krb5_boolean override;
 {
     struct krb5_cc_typelist *t;
diff --git a/src/lib/krb5/ccache/ccdefault.c b/src/lib/krb5/ccache/ccdefault.c
index 2c4eea9f5..7fde85286 100644
--- a/src/lib/krb5/ccache/ccdefault.c
+++ b/src/lib/krb5/ccache/ccdefault.c
@@ -36,7 +36,7 @@
 krb5_error_code KRB5_CALLCONV
 krb5_cc_default(context, ccache)
    krb5_context context;
-   krb5_ccache FAR *ccache;
+   krb5_ccache *ccache;
 {
     krb5_error_code retval;
 	krb5_os_context	os_ctx;
@@ -65,7 +65,7 @@ krb5_cc_default(context, ccache)
 krb5_error_code KRB5_CALLCONV
 krb5int_cc_default(context, ccache)
 	krb5_context context;
-	krb5_ccache FAR *ccache;
+	krb5_ccache *ccache;
 {
 #ifdef USE_LOGIN_LIBRARY
 	{
diff --git a/src/lib/krb5/ccache/ccfns.c b/src/lib/krb5/ccache/ccfns.c
index 35a17367e..a8715b402 100644
--- a/src/lib/krb5/ccache/ccfns.c
+++ b/src/lib/krb5/ccache/ccfns.c
@@ -30,14 +30,14 @@
 
 #include "k5-int.h"
 
-const char FAR * KRB5_CALLCONV
+const char * KRB5_CALLCONV
 krb5_cc_get_name (krb5_context context, krb5_ccache cache)
 {
     return cache->ops->get_name(context, cache);
 }
 
 krb5_error_code KRB5_CALLCONV
-krb5_cc_gen_new (krb5_context context, krb5_ccache FAR *cache)
+krb5_cc_gen_new (krb5_context context, krb5_ccache *cache)
 {
     return (*cache)->ops->gen_new(context, cache);
 }
@@ -63,50 +63,50 @@ krb5_cc_close (krb5_context context, krb5_ccache cache)
 
 krb5_error_code KRB5_CALLCONV
 krb5_cc_store_cred (krb5_context context, krb5_ccache cache,
-		    krb5_creds FAR *creds)
+		    krb5_creds *creds)
 {
     return cache->ops->store(context, cache, creds);
 }
 
 krb5_error_code KRB5_CALLCONV
 krb5_cc_retrieve_cred (krb5_context context, krb5_ccache cache,
-		       krb5_flags flags, krb5_creds FAR *mcreds,
-		       krb5_creds FAR *creds)
+		       krb5_flags flags, krb5_creds *mcreds,
+		       krb5_creds *creds)
 {
     return cache->ops->retrieve(context, cache, flags, mcreds, creds);
 }
 
 krb5_error_code KRB5_CALLCONV
 krb5_cc_get_principal (krb5_context context, krb5_ccache cache,
-		       krb5_principal FAR *principal)
+		       krb5_principal *principal)
 {
     return cache->ops->get_princ(context, cache, principal);
 }
 
 krb5_error_code KRB5_CALLCONV
 krb5_cc_start_seq_get (krb5_context context, krb5_ccache cache,
-		       krb5_cc_cursor FAR *cursor)
+		       krb5_cc_cursor *cursor)
 {
     return cache->ops->get_first(context, cache, cursor);
 }
 
 krb5_error_code KRB5_CALLCONV
 krb5_cc_next_cred (krb5_context context, krb5_ccache cache,
-		   krb5_cc_cursor FAR *cursor, krb5_creds FAR *creds)
+		   krb5_cc_cursor *cursor, krb5_creds *creds)
 {
     return cache->ops->get_next(context, cache, cursor, creds);
 }
 
 krb5_error_code KRB5_CALLCONV
 krb5_cc_end_seq_get (krb5_context context, krb5_ccache cache,
-		     krb5_cc_cursor FAR *cursor)
+		     krb5_cc_cursor *cursor)
 {
     return cache->ops->end_get(context, cache, cursor);
 }
 
 krb5_error_code KRB5_CALLCONV
 krb5_cc_remove_cred (krb5_context context, krb5_ccache cache, krb5_flags flags,
-		     krb5_creds FAR *creds)
+		     krb5_creds *creds)
 {
     return cache->ops->remove_cred(context, cache, flags, creds);
 }
@@ -117,7 +117,7 @@ krb5_cc_set_flags (krb5_context context, krb5_ccache cache, krb5_flags flags)
     return cache->ops->set_flags(context, cache, flags);
 }
 
-const char FAR * KRB5_CALLCONV
+const char * KRB5_CALLCONV
 krb5_cc_get_type (krb5_context context, krb5_ccache cache)
 {
     return cache->ops->prefix;
diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog
index e1d8327fb..ad3cbb7de 100644
--- a/src/lib/krb5/keytab/ChangeLog
+++ b/src/lib/krb5/keytab/ChangeLog
@@ -1,7 +1,8 @@
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* ktadd.c, ktbase.c, ktdefault.c, ktfr_entry.c, ktremove.c,
-	read_servi.c: Don't use KRB5_DLLIMP.
+	read_servi.c: Don't use KRB5_DLLIMP.  Don't explicitly declare
+	pointers FAR any more.
 
 2000-10-17  Ezra Peisach  <epeisach@mit.edu>
 
diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog
index c1e910a93..e23c9b11d 100644
--- a/src/lib/krb5/keytab/file/ChangeLog
+++ b/src/lib/krb5/keytab/file/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* ser_ktf.c: Drop _MSDOS support.
+
 2000-10-17  Ezra Peisach  <epeisach@mit.edu>
 
 	* ktf_util.c: Unsigned/signed int cleanups.
diff --git a/src/lib/krb5/keytab/file/ser_ktf.c b/src/lib/krb5/keytab/file/ser_ktf.c
index af4189617..ca54f93b6 100644
--- a/src/lib/krb5/keytab/file/ser_ktf.c
+++ b/src/lib/krb5/keytab/file/ser_ktf.c
@@ -166,7 +166,7 @@ krb5_ktf_keytab_externalize(kcontext, arg, buffer, lenremain)
 			int	fflags = 0;
 
 			file_is_open = 1;
-#if !defined( macintosh) && !defined(_MSDOS) && !defined(_WIN32)
+#if !defined( macintosh) && !defined(_WIN32)
 			fflags = fcntl(fileno(ktdata->openf), F_GETFL, 0);
 			if (fflags > 0)
 			    file_is_open |= ((fflags & O_ACCMODE) << 1);
@@ -285,7 +285,7 @@ krb5_ktf_keytab_internalize(kcontext, argp, buffer, lenremain)
 				int 	fmode;
 				long	fpos;
 
-#if !defined( macintosh) && !defined(_MSDOS) && !defined(_WIN32)
+#if !defined( macintosh) && !defined(_WIN32)
 				fmode = (file_is_open >> 1) & O_ACCMODE;
 #else
 				fmode = 0;
diff --git a/src/lib/krb5/keytab/ktadd.c b/src/lib/krb5/keytab/ktadd.c
index ba9e9fc3b..6f1fc0c02 100644
--- a/src/lib/krb5/keytab/ktadd.c
+++ b/src/lib/krb5/keytab/ktadd.c
@@ -33,7 +33,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_kt_add_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
-    krb5_keytab_entry FAR *entry;
+    krb5_keytab_entry *entry;
 {
     if (id->ops->add)
 	return (*id->ops->add)(context, id, entry);
diff --git a/src/lib/krb5/keytab/ktbase.c b/src/lib/krb5/keytab/ktbase.c
index bdac5622e..b808ec42b 100644
--- a/src/lib/krb5/keytab/ktbase.c
+++ b/src/lib/krb5/keytab/ktbase.c
@@ -55,7 +55,7 @@ static struct krb5_kt_typelist *kt_typehead = &krb5_kt_typelist_srvtab;
 krb5_error_code KRB5_CALLCONV
 krb5_kt_register(context, ops)
     krb5_context context;
-    krb5_kt_ops FAR *ops;
+    krb5_kt_ops *ops;
 {
     struct krb5_kt_typelist *t;
     for (t = kt_typehead;t && strcmp(t->ops->prefix,ops->prefix);t = t->next)
@@ -84,8 +84,8 @@ krb5_kt_register(context, ops)
 krb5_error_code KRB5_CALLCONV
 krb5_kt_resolve (context, name, ktid)
     krb5_context context;
-    krb5_const char FAR *name;
-    krb5_keytab FAR *ktid;
+    krb5_const char *name;
+    krb5_keytab *ktid;
 {
     struct krb5_kt_typelist *tlist;
     char *pfx;
diff --git a/src/lib/krb5/keytab/ktdefault.c b/src/lib/krb5/keytab/ktdefault.c
index 90f03dc85..51ab8745c 100644
--- a/src/lib/krb5/keytab/ktdefault.c
+++ b/src/lib/krb5/keytab/ktdefault.c
@@ -33,7 +33,7 @@
 krb5_error_code KRB5_CALLCONV
 krb5_kt_default(context, id)
     krb5_context context;
-    krb5_keytab FAR *id;
+    krb5_keytab *id;
 {
     char defname[BUFSIZ];
     krb5_error_code retval;
diff --git a/src/lib/krb5/keytab/ktfr_entry.c b/src/lib/krb5/keytab/ktfr_entry.c
index 3582193a3..b985e805a 100644
--- a/src/lib/krb5/keytab/ktfr_entry.c
+++ b/src/lib/krb5/keytab/ktfr_entry.c
@@ -32,7 +32,7 @@
 krb5_error_code KRB5_CALLCONV
 krb5_kt_free_entry (context, entry)
     krb5_context context;
-    krb5_keytab_entry FAR *entry;
+    krb5_keytab_entry *entry;
 {
     if (!entry)
 	return 0;
diff --git a/src/lib/krb5/keytab/ktremove.c b/src/lib/krb5/keytab/ktremove.c
index abb37059b..d9599e3d5 100644
--- a/src/lib/krb5/keytab/ktremove.c
+++ b/src/lib/krb5/keytab/ktremove.c
@@ -33,7 +33,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_kt_remove_entry (context, id, entry)
     krb5_context context;
     krb5_keytab id;
-    krb5_keytab_entry FAR *entry;
+    krb5_keytab_entry *entry;
 {
     if (id->ops->remove)
 	return (*id->ops->remove)(context, id, entry);
diff --git a/src/lib/krb5/keytab/read_servi.c b/src/lib/krb5/keytab/read_servi.c
index 10a3964fe..141184c37 100644
--- a/src/lib/krb5/keytab/read_servi.c
+++ b/src/lib/krb5/keytab/read_servi.c
@@ -50,7 +50,7 @@ krb5_kt_read_service_key(context, keyprocarg, principal, vno, enctype, key)
     krb5_principal principal;
     krb5_kvno vno;
     krb5_enctype enctype;
-    krb5_keyblock FAR * FAR * key;
+    krb5_keyblock ** key;
 {
     krb5_error_code kerror = KSUCCESS;
     char keytabname[MAX_KEYTAB_NAME_LEN + 1]; /* + 1 for NULL termination */
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 1c73fa4df..65d9b6e69 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,17 +1,21 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* init_ctx.c, preauth.c: Drop _MSDOS support.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
-	* appdefault.c, auth_con.c, kld_pr_ext.c, bld_princ.c, chpw.c,
+	* appdefault.c, auth_con.c, bld_pr_ext.c, bld_princ.c, chpw.c,
 	conv_princ.c, copy_addrs.c, copy_athctr.c, copy_auth.c,
 	copy_cksum.c, copy_creds.c, copy_data.c, copy_key.c, copy_princ.c,
-	copy_tick.c, cp_key_cnt.c, decrypt_tk.c, deltat.c, fwd_tgt.c,
-	get_creds.c, get_in_tkt.c, gic_keytab.c, gic_opt.c, gic_pwd.c,
-	in_tkt_ktb.c, in_tkt_pwd.c, in_tkt_sky.c, init_ctx.c, kfree.c,
-	mk_cred.c, mk_error.c, mk_priv.c, mk_rep.c, mk_req.c,
-	mk_req_ext.c, mk_safe.c, parse.c, princ_comp.c, rd_cred.c,
-	rd_error.c, rd_priv.c, rd_rep.c, rd_req.c, rd_safe.c, recvauth.c,
-	sendauth.c, ser_actx.c, ser_ctx.c, serialize.c, set_realm.c,
-	srv_rcache.c, str_conv.c, unparse.c, vfy_increds.c, vic_opt.c,
-	x-deltat.y: Don't use KRB5_DLLIMP.
+	copy_tick.c, cp_key_cnt.c, decrypt_tk.c, fwd_tgt.c, get_creds.c,
+	get_in_tkt.c, gic_keytab.c, gic_opt.c, gic_pwd.c, in_tkt_ktb.c,
+	in_tkt_pwd.c, in_tkt_sky.c, init_ctx.c, kfree.c, mk_cred.c,
+	mk_error.c, mk_priv.c, mk_rep.c, mk_req.c, mk_req_ext.c,
+	mk_safe.c, parse.c, princ_comp.c, rd_cred.c, rd_error.c,
+	rd_priv.c, rd_rep.c, rd_req.c, rd_safe.c, recvauth.c, sendauth.c,
+	ser_actx.c, ser_ctx.c, serialize.c, set_realm.c, srv_rcache.c,
+	str_conv.c, unparse.c, vfy_increds.c, vic_opt.c, x-deltat.y: Don't
+	use KRB5_DLLIMP.  Don't explicitly declare pointers FAR any more.
 
 2001-09-07  Ken Raeburn  <raeburn@mit.edu>
 
diff --git a/src/lib/krb5/krb/auth_con.c b/src/lib/krb5/krb/auth_con.c
index 14f91e4a0..ac41ef3dc 100644
--- a/src/lib/krb5/krb/auth_con.c
+++ b/src/lib/krb5/krb/auth_con.c
@@ -28,7 +28,7 @@ actx_copy_addr(context, inad, outad)
 krb5_error_code KRB5_CALLCONV
 krb5_auth_con_init(context, auth_context)
     krb5_context      	  context;
-    krb5_auth_context  FAR * auth_context;
+    krb5_auth_context * auth_context;
 {
     *auth_context =
             (krb5_auth_context)malloc(sizeof(struct _krb5_auth_context));
@@ -177,7 +177,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_auth_con_setuseruserkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_keyblock   FAR * keyblock;		
+    krb5_keyblock * keyblock;		
 {
     if (auth_context->keyblock)
 	krb5_free_keyblock(context, auth_context->keyblock);
@@ -200,7 +200,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getlocalsubkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_keyblock FAR * FAR * keyblock;		
+    krb5_keyblock ** keyblock;		
 {
     if (auth_context->local_subkey)
     	return krb5_copy_keyblock(context,auth_context->local_subkey,keyblock);
@@ -212,7 +212,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getremotesubkey(context, auth_context, keyblock)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_keyblock FAR * FAR * keyblock;		
+    krb5_keyblock ** keyblock;		
 {
     if (auth_context->remote_subkey)
     	return krb5_copy_keyblock(context,auth_context->remote_subkey,keyblock);
@@ -254,7 +254,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getauthenticator(context, auth_context, authenticator)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_authenticator FAR * FAR * authenticator;		
+    krb5_authenticator ** authenticator;		
 {
     return (krb5_copy_authenticator(context, auth_context->authentp,
 				    authenticator));
@@ -264,7 +264,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getremoteseqnumber(context, auth_context, seqnumber)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_int32	    FAR * seqnumber;		
+    krb5_int32	 * seqnumber;		
 {
     *seqnumber = auth_context->remote_seq_number;
     return 0;
@@ -326,7 +326,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_auth_con_getflags(context, auth_context, flags)
     krb5_context      	  context;
     krb5_auth_context 	  auth_context;
-    krb5_int32	    FAR * flags;
+    krb5_int32	 * flags;
 {
     *flags = auth_context->auth_context_flags;
     return 0;
diff --git a/src/lib/krb5/krb/bld_pr_ext.c b/src/lib/krb5/krb/bld_pr_ext.c
index 9ce0459f1..cc4d6b85d 100644
--- a/src/lib/krb5/krb/bld_pr_ext.c
+++ b/src/lib/krb5/krb/bld_pr_ext.c
@@ -37,13 +37,13 @@
 
 krb5_error_code KRB5_CALLCONV_C
 #ifdef HAVE_STDARG_H
-krb5_build_principal_ext(krb5_context context,  krb5_principal FAR * princ, unsigned int rlen, krb5_const char FAR * realm, ...)
+krb5_build_principal_ext(krb5_context context,  krb5_principal * princ, unsigned int rlen, krb5_const char * realm, ...)
 #else
 krb5_build_principal_ext(context, princ, rlen, realm, va_alist)
     krb5_context context;
-    krb5_principal FAR *princ;
+    krb5_principal *princ;
     unsigned int rlen;
-    krb5_const char FAR *realm;
+    krb5_const char *realm;
     va_dcl
 #endif
 {
diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
index 335543980..0e3cd23f0 100644
--- a/src/lib/krb5/krb/bld_princ.c
+++ b/src/lib/krb5/krb/bld_princ.c
@@ -103,13 +103,13 @@ krb5_error_code KRB5_CALLCONV_C
 #ifdef HAVE_STDARG_H
 krb5_build_principal(krb5_context context,  krb5_principal * princ, 
 		     unsigned int rlen,
-		     krb5_const char FAR * realm, ...)
+		     krb5_const char * realm, ...)
 #else
 krb5_build_principal(context, princ, rlen, realm, va_alist)
     krb5_context context;
     krb5_principal *princ;
     unsigned int rlen;
-    krb5_const char FAR *realm;
+    krb5_const char *realm;
     va_dcl
 #endif
 {
diff --git a/src/lib/krb5/krb/conv_princ.c b/src/lib/krb5/krb/conv_princ.c
index 4239c353d..5c1853c4a 100644
--- a/src/lib/krb5/krb/conv_princ.c
+++ b/src/lib/krb5/krb/conv_princ.c
@@ -131,9 +131,9 @@ krb5_error_code KRB5_CALLCONV
 krb5_524_conv_principal(context, princ, name, inst, realm)
     krb5_context context;
     const krb5_principal princ;
-    char FAR *name;
-    char FAR *inst;
-    char FAR *realm;
+    char *name;
+    char *inst;
+    char *realm;
 {
      const struct krb_convert *p;
      krb5_data *compo;
@@ -232,10 +232,10 @@ krb5_524_conv_principal(context, princ, name, inst, realm)
 krb5_error_code KRB5_CALLCONV
 krb5_425_conv_principal(context, name, instance, realm, princ)
    krb5_context context;
-   const char	FAR *name;
-   const char	FAR *instance;
-   const char	FAR *realm;
-   krb5_principal	FAR *princ;
+   const char	 *name;
+   const char	 *instance;
+   const char	 *realm;
+   krb5_principal	 *princ;
 {
      const struct krb_convert *p;
      char buf[256];		/* V4 instances are limited to 40 characters */
diff --git a/src/lib/krb5/krb/copy_addrs.c b/src/lib/krb5/krb/copy_addrs.c
index 5310351f4..667da476c 100644
--- a/src/lib/krb5/krb/copy_addrs.c
+++ b/src/lib/krb5/krb/copy_addrs.c
@@ -32,12 +32,12 @@
 krb5_error_code KRB5_CALLCONV
 krb5_copy_addr(context, inad, outad)
     krb5_context context;
-    const krb5_address FAR *inad;
-    krb5_address FAR * FAR *outad;
+    const krb5_address *inad;
+    krb5_address **outad;
 {
-    krb5_address FAR *tmpad;
+    krb5_address *tmpad;
 
-    if (!(tmpad = (krb5_address FAR *)malloc(sizeof(*tmpad))))
+    if (!(tmpad = (krb5_address *)malloc(sizeof(*tmpad))))
 	return ENOMEM;
 #ifdef HAVE_C_STRUCTURE_ASSIGNMENT
     *tmpad = *inad;
@@ -59,8 +59,8 @@ krb5_copy_addr(context, inad, outad)
 krb5_error_code KRB5_CALLCONV
 krb5_copy_addresses(context, inaddr, outaddr)
     krb5_context context;
-    krb5_address FAR * const FAR * inaddr;
-    krb5_address FAR * FAR * FAR *outaddr;
+    krb5_address * const * inaddr;
+    krb5_address ***outaddr;
 {
     krb5_error_code retval;
     krb5_address ** tempaddr;
diff --git a/src/lib/krb5/krb/copy_athctr.c b/src/lib/krb5/krb/copy_athctr.c
index 62c5af3ef..e421d903f 100644
--- a/src/lib/krb5/krb/copy_athctr.c
+++ b/src/lib/krb5/krb/copy_athctr.c
@@ -32,8 +32,8 @@
 krb5_error_code KRB5_CALLCONV
 krb5_copy_authenticator(context, authfrom, authto)
     krb5_context context;
-    const krb5_authenticator FAR *authfrom;
-    krb5_authenticator FAR *FAR *authto;
+    const krb5_authenticator *authfrom;
+    krb5_authenticator **authto;
 {
     krb5_error_code retval;
     krb5_authenticator *tempto;
diff --git a/src/lib/krb5/krb/copy_auth.c b/src/lib/krb5/krb/copy_auth.c
index f0aba10dd..cd4abccaa 100644
--- a/src/lib/krb5/krb/copy_auth.c
+++ b/src/lib/krb5/krb/copy_auth.c
@@ -59,8 +59,8 @@ krb5_authdata **outad;
 krb5_error_code KRB5_CALLCONV
 krb5_copy_authdata(context, inauthdat, outauthdat)
     krb5_context context;
-    krb5_authdata FAR * const FAR * inauthdat;
-    krb5_authdata FAR * FAR * FAR *outauthdat;
+    krb5_authdata * const * inauthdat;
+    krb5_authdata ***outauthdat;
 {
     krb5_error_code retval;
     krb5_authdata ** tempauthdat;
diff --git a/src/lib/krb5/krb/copy_cksum.c b/src/lib/krb5/krb/copy_cksum.c
index 971000f8f..0507c27b9 100644
--- a/src/lib/krb5/krb/copy_cksum.c
+++ b/src/lib/krb5/krb/copy_cksum.c
@@ -32,8 +32,8 @@
 krb5_error_code KRB5_CALLCONV
 krb5_copy_checksum(context, ckfrom, ckto)
     krb5_context context;
-    const krb5_checksum FAR *ckfrom;
-    krb5_checksum FAR * FAR *ckto;
+    const krb5_checksum *ckfrom;
+    krb5_checksum **ckto;
 {
     krb5_checksum *tempto;
 
diff --git a/src/lib/krb5/krb/copy_data.c b/src/lib/krb5/krb/copy_data.c
index 2a21488e5..a8b227908 100644
--- a/src/lib/krb5/krb/copy_data.c
+++ b/src/lib/krb5/krb/copy_data.c
@@ -35,8 +35,8 @@
 krb5_error_code KRB5_CALLCONV
 krb5_copy_data(context, indata, outdata)
     krb5_context context;
-    const krb5_data FAR *indata;
-    krb5_data FAR * FAR *outdata;
+    const krb5_data *indata;
+    krb5_data **outdata;
 {
     krb5_data *tempdata;
 
diff --git a/src/lib/krb5/krb/copy_key.c b/src/lib/krb5/krb/copy_key.c
index 96d889676..9a5fa13e8 100644
--- a/src/lib/krb5/krb/copy_key.c
+++ b/src/lib/krb5/krb/copy_key.c
@@ -35,8 +35,8 @@
 krb5_error_code KRB5_CALLCONV
 krb5_copy_keyblock(context, from, to)
     krb5_context context;
-    const krb5_keyblock FAR *from;
-    krb5_keyblock FAR * FAR *to;
+    const krb5_keyblock *from;
+    krb5_keyblock **to;
 {
 	krb5_keyblock	*new_key;
 
diff --git a/src/lib/krb5/krb/copy_princ.c b/src/lib/krb5/krb/copy_princ.c
index 6051ecb3d..d85bedc3c 100644
--- a/src/lib/krb5/krb/copy_princ.c
+++ b/src/lib/krb5/krb/copy_princ.c
@@ -36,7 +36,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_copy_principal(context, inprinc, outprinc)
     krb5_context context;
     krb5_const_principal inprinc;
-    krb5_principal FAR *outprinc;
+    krb5_principal *outprinc;
 {
     register krb5_principal tempprinc;
     register int i, nelems;
diff --git a/src/lib/krb5/krb/cp_key_cnt.c b/src/lib/krb5/krb/cp_key_cnt.c
index 0934b124c..d83d07a26 100644
--- a/src/lib/krb5/krb/cp_key_cnt.c
+++ b/src/lib/krb5/krb/cp_key_cnt.c
@@ -35,8 +35,8 @@
 krb5_error_code KRB5_CALLCONV
 krb5_copy_keyblock_contents(context, from, to)
     krb5_context context;
-    const krb5_keyblock FAR *from;
-    krb5_keyblock FAR *to;
+    const krb5_keyblock *from;
+    krb5_keyblock *to;
 {
     *to = *from;
     to->contents = (krb5_octet *)malloc(to->length);
diff --git a/src/lib/krb5/krb/decrypt_tk.c b/src/lib/krb5/krb/decrypt_tk.c
index 7fcf618a8..c8b35d442 100644
--- a/src/lib/krb5/krb/decrypt_tk.c
+++ b/src/lib/krb5/krb/decrypt_tk.c
@@ -41,8 +41,8 @@
 krb5_error_code KRB5_CALLCONV
 krb5_decrypt_tkt_part(context, srv_key, ticket)
     krb5_context context;
-    const krb5_keyblock FAR *srv_key;
-    register krb5_ticket FAR *ticket;
+    const krb5_keyblock *srv_key;
+    register krb5_ticket *ticket;
 {
     krb5_enc_tkt_part *dec_tkt_part;
     krb5_data scratch;
diff --git a/src/lib/krb5/krb/deltat.c b/src/lib/krb5/krb/deltat.c
index 057c1367e..c71909a02 100644
--- a/src/lib/krb5/krb/deltat.c
+++ b/src/lib/krb5/krb/deltat.c
@@ -1,6 +1,7 @@
 
 /*  A Bison parser, made from ../../../../src/lib/krb5/krb/x-deltat.y
-    by GNU Bison version 1.28  */
+ by  GNU Bison version 1.27
+  */
 
 #define YYBISON 1  /* Identify Bison output.  */
 
@@ -233,8 +234,8 @@ static const short yycheck[] = {     0,
 #define YYPURE 1
 
 /* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/tmp/bison/share/bison.simple"
-/* This file comes from bison-1.28.  */
+#line 3 "/mit/gnu/share/bison.simple"
+/* This file comes from bison-1.27.  */
 
 /* Skeleton output parser for bison,
    Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -447,7 +448,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
 #endif
 #endif
 
-#line 217 "/tmp/bison/share/bison.simple"
+#line 216 "/mit/gnu/share/bison.simple"
 
 /* The user can define YYPARSE_PARAM as the name of an argument to be passed
    into yyparse.  The argument should have type void *.
@@ -831,7 +832,7 @@ case 21:
     break;}
 }
    /* the action file gets copied in in place of this dollarsign */
-#line 543 "/tmp/bison/share/bison.simple"
+#line 542 "/mit/gnu/share/bison.simple"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -1108,8 +1109,8 @@ mylex (krb5_int32 *intp, char **pp)
 
 krb5_error_code KRB5_CALLCONV
 krb5_string_to_deltat(string, deltatp)
-    char	FAR * string;
-    krb5_deltat	FAR * deltatp;
+    char	* string;
+    krb5_deltat	* deltatp;
 {
     struct param p;
     p.delta = 0;
diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c
index 22f240835..9dd9e116b 100644
--- a/src/lib/krb5/krb/fwd_tgt.c
+++ b/src/lib/krb5/krb/fwd_tgt.c
@@ -39,19 +39,19 @@ krb5_fwd_tgt_creds(context, auth_context, rhost, client, server, cc,
 		   forwardable, outbuf)
     krb5_context context;
     krb5_auth_context auth_context;
-    char FAR *rhost;
+    char *rhost;
     krb5_principal client;
     krb5_principal server;
     krb5_ccache cc;
     int forwardable;      /* Should forwarded TGT also be forwardable? */
-    krb5_data FAR *outbuf;
+    krb5_data *outbuf;
 {
     krb5_replay_data replaydata;
-    krb5_data FAR * scratch = 0;
-    krb5_address FAR * FAR *addrs = 0;
+    krb5_data * scratch = 0;
+    krb5_address **addrs = 0;
     krb5_error_code retval;
     krb5_creds creds, tgt;
-    krb5_creds FAR *pcreds;
+    krb5_creds *pcreds;
     krb5_flags kdcoptions;
     int close_cc = 0;
     int free_rhost = 0;
diff --git a/src/lib/krb5/krb/get_creds.c b/src/lib/krb5/krb/get_creds.c
index b3b89d109..0455be4db 100644
--- a/src/lib/krb5/krb/get_creds.c
+++ b/src/lib/krb5/krb/get_creds.c
@@ -105,8 +105,8 @@ krb5_get_credentials(context, options, ccache, in_creds, out_creds)
     krb5_context context;
     const krb5_flags options;
     krb5_ccache ccache;
-    krb5_creds FAR *in_creds;
-    krb5_creds FAR * FAR *out_creds;
+    krb5_creds *in_creds;
+    krb5_creds **out_creds;
 {
     krb5_error_code retval;
     krb5_creds mcreds;
diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index 04bc511b3..0a8f690ee 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -411,16 +411,16 @@ krb5_get_in_tkt(context, options, addrs, ktypes, ptypes, key_proc, keyseed,
 		decrypt_proc, decryptarg, creds, ccache, ret_as_reply)
     krb5_context context;
     const krb5_flags options;
-    krb5_address FAR * const FAR * addrs;
-    krb5_enctype FAR * ktypes;
-    krb5_preauthtype FAR * ptypes;
+    krb5_address * const * addrs;
+    krb5_enctype * ktypes;
+    krb5_preauthtype * ptypes;
     git_key_proc key_proc;
     krb5_const_pointer keyseed;
     git_decrypt_proc decrypt_proc;
     krb5_const_pointer decryptarg;
-    krb5_creds FAR * creds;
+    krb5_creds * creds;
     krb5_ccache ccache;
-    krb5_kdc_rep FAR * FAR * ret_as_reply;
+    krb5_kdc_rep ** ret_as_reply;
 {
     krb5_error_code	retval;
     krb5_timestamp	time_now;
diff --git a/src/lib/krb5/krb/in_tkt_ktb.c b/src/lib/krb5/krb/in_tkt_ktb.c
index f6678bbf5..cb9c41e1a 100644
--- a/src/lib/krb5/krb/in_tkt_ktb.c
+++ b/src/lib/krb5/krb/in_tkt_ktb.c
@@ -114,13 +114,13 @@ krb5_get_in_tkt_with_keytab(context, options, addrs, ktypes, pre_auth_types,
 			    keytab, ccache, creds, ret_as_reply)
     krb5_context context;
     const krb5_flags options;
-    krb5_address FAR * const FAR * addrs;
-    krb5_enctype FAR * ktypes;
-    krb5_preauthtype FAR * pre_auth_types;
+    krb5_address * const * addrs;
+    krb5_enctype * ktypes;
+    krb5_preauthtype * pre_auth_types;
     const krb5_keytab keytab;
     krb5_ccache ccache;
-    krb5_creds FAR * creds;
-    krb5_kdc_rep FAR *FAR * ret_as_reply;
+    krb5_creds * creds;
+    krb5_kdc_rep ** ret_as_reply;
 {
     struct keytab_keyproc_arg arg;
 
diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c
index 4773c297b..b494f1194 100644
--- a/src/lib/krb5/krb/in_tkt_pwd.c
+++ b/src/lib/krb5/krb/in_tkt_pwd.c
@@ -100,13 +100,13 @@ krb5_get_in_tkt_with_password(context, options, addrs, ktypes, pre_auth_types,
 			      password, ccache, creds, ret_as_reply)
     krb5_context context;
     const krb5_flags options;
-    krb5_address FAR * const FAR * addrs;
-    krb5_enctype FAR * ktypes;
-    krb5_preauthtype FAR * pre_auth_types;
-    const char FAR * password;
+    krb5_address * const * addrs;
+    krb5_enctype * ktypes;
+    krb5_preauthtype * pre_auth_types;
+    const char * password;
     krb5_ccache ccache;
-    krb5_creds FAR * creds;
-    krb5_kdc_rep FAR * FAR * ret_as_reply;
+    krb5_creds * creds;
+    krb5_kdc_rep ** ret_as_reply;
 {
     krb5_error_code retval;
     krb5_data data;
diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index 754b8ce71..0ca1e7ef2 100644
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -102,13 +102,13 @@ krb5_get_in_tkt_with_skey(context, options, addrs, ktypes, pre_auth_types,
 			  key, ccache, creds, ret_as_reply)
     krb5_context context;
     const krb5_flags options;
-    krb5_address FAR * const FAR * addrs;
-    krb5_enctype FAR * ktypes;
-    krb5_preauthtype FAR * pre_auth_types;
-    const krb5_keyblock FAR * key;
+    krb5_address * const * addrs;
+    krb5_enctype * ktypes;
+    krb5_preauthtype * pre_auth_types;
+    const krb5_keyblock * key;
     krb5_ccache ccache;
-    krb5_creds FAR * creds;
-    krb5_kdc_rep FAR * FAR * ret_as_reply;
+    krb5_creds * creds;
+    krb5_kdc_rep ** ret_as_reply;
 
 {
     if (key) 
diff --git a/src/lib/krb5/krb/init_ctx.c b/src/lib/krb5/krb/init_ctx.c
index 5f8c03f49..7fb025ff5 100644
--- a/src/lib/krb5/krb/init_ctx.c
+++ b/src/lib/krb5/krb/init_ctx.c
@@ -68,7 +68,7 @@
 	"des3-cbc-sha1 " \
 	"des-cbc-crc des-cbc-md5 des-cbc-md4 "
 
-#if (defined(_MSDOS) || defined(_WIN32))
+#if (defined(_WIN32))
 extern krb5_error_code krb5_vercheck();
 extern void krb5_win_ccdll_load(krb5_context context);
 #endif
@@ -110,7 +110,7 @@ init_common (context, secure)
 	/* Initialize error tables */
 	krb5_init_ets(ctx);
 
-#if (defined(_MSDOS) || defined(_WIN32))
+#if (defined(_WIN32))
 	/* 
 	 * Load the krbcc32.dll if necessary.  We do this here so that
 	 * we know to use API: later on during initialization.
@@ -299,7 +299,7 @@ get_profile_etype_list(context, ktypes, profstr, ctx_count, ctx_list)
      krb5_enctype **ktypes;
      char *profstr;
      int ctx_count;
-     krb5_enctype FAR *ctx_list;
+     krb5_enctype *ctx_list;
 {
     krb5_enctype *old_ktypes;
 
@@ -424,7 +424,7 @@ void
 KRB5_CALLCONV
 krb5_free_ktypes (context, val)
      krb5_context context;
-     krb5_enctype FAR *val;
+     krb5_enctype *val;
 {
     free (val);
 }
diff --git a/src/lib/krb5/krb/kfree.c b/src/lib/krb5/krb/kfree.c
index a87ac7b17..da7d294db 100644
--- a/src/lib/krb5/krb/kfree.c
+++ b/src/lib/krb5/krb/kfree.c
@@ -31,7 +31,7 @@
 void KRB5_CALLCONV
 krb5_free_address(context, val)
     krb5_context context;
-    krb5_address FAR *val;
+    krb5_address *val;
 {
     if (val->contents)
 	krb5_xfree(val->contents);
@@ -41,7 +41,7 @@ krb5_free_address(context, val)
 void KRB5_CALLCONV
 krb5_free_addresses(context, val)
     krb5_context context;
-    krb5_address FAR * FAR *val;
+    krb5_address **val;
 {
     register krb5_address **temp;
 
@@ -57,7 +57,7 @@ krb5_free_addresses(context, val)
 void KRB5_CALLCONV
 krb5_free_ap_rep(context, val)
     krb5_context context;
-    register krb5_ap_rep FAR *val;
+    register krb5_ap_rep *val;
 {
     if (val->enc_part.ciphertext.data)
 	krb5_xfree(val->enc_part.ciphertext.data);
@@ -67,7 +67,7 @@ krb5_free_ap_rep(context, val)
 void KRB5_CALLCONV
 krb5_free_ap_req(context, val)
     krb5_context context;
-    register krb5_ap_req FAR *val;
+    register krb5_ap_req *val;
 {
     if (val->ticket)
 	krb5_free_ticket(context, val->ticket);
@@ -79,7 +79,7 @@ krb5_free_ap_req(context, val)
 void KRB5_CALLCONV
 krb5_free_ap_rep_enc_part(context, val)
     krb5_context context;
-    krb5_ap_rep_enc_part FAR *val;
+    krb5_ap_rep_enc_part *val;
 {
     if (val->subkey)
 	krb5_free_keyblock(context, val->subkey);
@@ -89,7 +89,7 @@ krb5_free_ap_rep_enc_part(context, val)
 void KRB5_CALLCONV
 krb5_free_authenticator_contents(context, val)
     krb5_context context;
-    krb5_authenticator FAR *val;
+    krb5_authenticator *val;
 {
     if (val->checksum) {
 	krb5_free_checksum(context, val->checksum);
@@ -112,7 +112,7 @@ krb5_free_authenticator_contents(context, val)
 void KRB5_CALLCONV
 krb5_free_authdata(context, val)
     krb5_context context;
-    krb5_authdata FAR * FAR *val;
+    krb5_authdata **val;
 {
     register krb5_authdata **temp;
 
@@ -127,7 +127,7 @@ krb5_free_authdata(context, val)
 void KRB5_CALLCONV
 krb5_free_authenticator(context, val)
     krb5_context context;
-    krb5_authenticator FAR *val;
+    krb5_authenticator *val;
 {
     krb5_free_authenticator_contents(context, val);
     krb5_xfree(val);
@@ -156,7 +156,7 @@ krb5_free_checksum_contents(context, val)
 void KRB5_CALLCONV
 krb5_free_cred(context, val)
     krb5_context context;
-    register krb5_cred FAR *val;
+    register krb5_cred *val;
 {
     if (val->tickets)
         krb5_free_tickets(context, val->tickets);
@@ -173,7 +173,7 @@ krb5_free_cred(context, val)
 void KRB5_CALLCONV
 krb5_free_cred_contents(context, val)
     krb5_context context;
-    krb5_creds FAR *val;
+    krb5_creds *val;
 {
     if (val->client) {
 	krb5_free_principal(context, val->client);
@@ -209,7 +209,7 @@ krb5_free_cred_contents(context, val)
 void KRB5_CALLCONV 
 krb5_free_cred_enc_part(context, val)
     krb5_context context;
-    register krb5_cred_enc_part FAR *val;
+    register krb5_cred_enc_part *val;
 {
     register krb5_cred_info **temp;
     
@@ -243,7 +243,7 @@ krb5_free_cred_enc_part(context, val)
 void KRB5_CALLCONV
 krb5_free_creds(context, val)
     krb5_context context;
-    krb5_creds FAR *val;
+    krb5_creds *val;
 {
     krb5_free_cred_contents(context, val);
     krb5_xfree(val);
@@ -253,7 +253,7 @@ krb5_free_creds(context, val)
 void KRB5_CALLCONV
 krb5_free_data(context, val)
     krb5_context context;
-    krb5_data FAR * val;
+    krb5_data * val;
 {
     if (val->data)
 	krb5_xfree(val->data);
@@ -263,7 +263,7 @@ krb5_free_data(context, val)
 void KRB5_CALLCONV
 krb5_free_data_contents(context, val)
     krb5_context context;
-    krb5_data FAR * val;
+    krb5_data * val;
 {
     if (val->data) {
 	krb5_xfree(val->data);
@@ -305,7 +305,7 @@ krb5_free_enc_kdc_rep_part(context, val)
 void KRB5_CALLCONV
 krb5_free_enc_tkt_part(context, val)
     krb5_context context;
-    krb5_enc_tkt_part FAR *val;
+    krb5_enc_tkt_part *val;
 {
     if (val->session)
 	krb5_free_keyblock(context, val->session);
@@ -324,7 +324,7 @@ krb5_free_enc_tkt_part(context, val)
 void KRB5_CALLCONV
 krb5_free_error(context, val)
     krb5_context context;
-    register krb5_error FAR *val;
+    register krb5_error *val;
 {
     if (val->client)
 	krb5_free_principal(context, val->client);
@@ -340,7 +340,7 @@ krb5_free_error(context, val)
 void KRB5_CALLCONV
 krb5_free_kdc_rep(context, val)
     krb5_context context;
-    krb5_kdc_rep FAR *val;
+    krb5_kdc_rep *val;
 {
     if (val->padata)
 	krb5_free_pa_data(context, val->padata);
@@ -359,7 +359,7 @@ krb5_free_kdc_rep(context, val)
 void KRB5_CALLCONV
 krb5_free_kdc_req(context, val)
     krb5_context context;
-    krb5_kdc_req FAR *val;
+    krb5_kdc_req *val;
 {
     if (val->padata)
 	krb5_free_pa_data(context, val->padata);
@@ -383,7 +383,7 @@ krb5_free_kdc_req(context, val)
 void KRB5_CALLCONV
 krb5_free_keyblock_contents(context, key)
      krb5_context context;
-     register krb5_keyblock FAR *key;
+     register krb5_keyblock *key;
 {
      if (key->contents) {
 	  memset(key->contents, 0, key->length);
@@ -395,7 +395,7 @@ krb5_free_keyblock_contents(context, key)
 void KRB5_CALLCONV
 krb5_free_keyblock(context, val)
     krb5_context context;
-    register krb5_keyblock FAR *val;
+    register krb5_keyblock *val;
 {
     krb5_free_keyblock_contents(context, val);
     krb5_xfree(val);
@@ -406,7 +406,7 @@ krb5_free_keyblock(context, val)
 void KRB5_CALLCONV
 krb5_free_last_req(context, val)
     krb5_context context;
-    krb5_last_req_entry FAR * FAR *val;
+    krb5_last_req_entry **val;
 {
     register krb5_last_req_entry **temp;
 
@@ -418,7 +418,7 @@ krb5_free_last_req(context, val)
 void KRB5_CALLCONV
 krb5_free_pa_data(context, val)
     krb5_context context;
-    krb5_pa_data FAR * FAR *val;
+    krb5_pa_data **val;
 {
     register krb5_pa_data **temp;
 
@@ -454,7 +454,7 @@ krb5_free_principal(context, val)
 void KRB5_CALLCONV
 krb5_free_priv(context, val)
     krb5_context context;
-    register krb5_priv FAR *val;
+    register krb5_priv *val;
 {
     if (val->enc_part.ciphertext.data)
 	krb5_xfree(val->enc_part.ciphertext.data);
@@ -464,7 +464,7 @@ krb5_free_priv(context, val)
 void KRB5_CALLCONV
 krb5_free_priv_enc_part(context, val)
     krb5_context context;
-    register krb5_priv_enc_part FAR *val;
+    register krb5_priv_enc_part *val;
 {
     if (val->user_data.data)
 	krb5_xfree(val->user_data.data);
@@ -478,7 +478,7 @@ krb5_free_priv_enc_part(context, val)
 void KRB5_CALLCONV
 krb5_free_pwd_data(context, val)
     krb5_context context;
-    krb5_pwd_data FAR *val;
+    krb5_pwd_data *val;
 {
     if (val->element)
 	krb5_free_pwd_sequences(context, val->element);
@@ -489,7 +489,7 @@ krb5_free_pwd_data(context, val)
 void KRB5_CALLCONV
 krb5_free_pwd_sequences(context, val)
     krb5_context context;
-    passwd_phrase_element FAR * FAR *val;
+    passwd_phrase_element **val;
 {
     if ((*val)->passwd) {
 	krb5_xfree((*val)->passwd);
@@ -505,7 +505,7 @@ krb5_free_pwd_sequences(context, val)
 void KRB5_CALLCONV
 krb5_free_safe(context, val)
     krb5_context context;
-    register krb5_safe FAR *val;
+    register krb5_safe *val;
 {
     if (val->user_data.data)
 	krb5_xfree(val->user_data.data);
@@ -522,7 +522,7 @@ krb5_free_safe(context, val)
 void KRB5_CALLCONV
 krb5_free_ticket(context, val)
     krb5_context context;
-    krb5_ticket FAR *val;
+    krb5_ticket *val;
 {
     if (val->server)
 	krb5_free_principal(context, val->server);
@@ -536,7 +536,7 @@ krb5_free_ticket(context, val)
 void KRB5_CALLCONV
 krb5_free_tickets(context, val)
     krb5_context context;
-    krb5_ticket FAR * FAR *val;
+    krb5_ticket **val;
 {
     register krb5_ticket **temp;
 
@@ -549,7 +549,7 @@ krb5_free_tickets(context, val)
 void KRB5_CALLCONV
 krb5_free_tgt_creds(context, tgts)
     krb5_context context;
-    krb5_creds FAR * FAR *tgts;
+    krb5_creds **tgts;
 {
     register krb5_creds **tgtpp;
     for (tgtpp = tgts; *tgtpp; tgtpp++)
@@ -560,7 +560,7 @@ krb5_free_tgt_creds(context, tgts)
 void KRB5_CALLCONV
 krb5_free_tkt_authent(context, val)
     krb5_context context;
-    krb5_tkt_authent FAR *val;
+    krb5_tkt_authent *val;
 {
     if (val->ticket)
 	    krb5_free_ticket(context, val->ticket);
@@ -572,14 +572,14 @@ krb5_free_tkt_authent(context, val)
 void KRB5_CALLCONV
 krb5_free_unparsed_name(context, val)
     krb5_context context;
-    char FAR * val;
+    char * val;
 {
     if (val)
 	krb5_xfree(val);
 }
 
 void KRB5_CALLCONV
-krb5_free_sam_challenge(krb5_context ctx, krb5_sam_challenge FAR *sc)
+krb5_free_sam_challenge(krb5_context ctx, krb5_sam_challenge *sc)
 {
     if (!sc)
 	return;
@@ -588,7 +588,7 @@ krb5_free_sam_challenge(krb5_context ctx, krb5_sam_challenge FAR *sc)
 }
 
 void KRB5_CALLCONV
-krb5_free_sam_challenge_contents(krb5_context ctx, krb5_sam_challenge FAR *sc)
+krb5_free_sam_challenge_contents(krb5_context ctx, krb5_sam_challenge *sc)
 {
     if (!sc)
 	return;
@@ -611,7 +611,7 @@ krb5_free_sam_challenge_contents(krb5_context ctx, krb5_sam_challenge FAR *sc)
 }
 
 void KRB5_CALLCONV
-krb5_free_sam_response(krb5_context ctx, krb5_sam_response FAR *sr)
+krb5_free_sam_response(krb5_context ctx, krb5_sam_response *sr)
 {
     if (!sr)
 	return;
@@ -620,7 +620,7 @@ krb5_free_sam_response(krb5_context ctx, krb5_sam_response FAR *sr)
 }
 
 void KRB5_CALLCONV
-krb5_free_sam_response_contents(krb5_context ctx, krb5_sam_response FAR *sr)
+krb5_free_sam_response_contents(krb5_context ctx, krb5_sam_response *sr)
 {
     if (!sr)
 	return;
@@ -634,7 +634,7 @@ krb5_free_sam_response_contents(krb5_context ctx, krb5_sam_response FAR *sr)
 
 void KRB5_CALLCONV
 krb5_free_predicted_sam_response(krb5_context ctx,
-				 krb5_predicted_sam_response FAR *psr)
+				 krb5_predicted_sam_response *psr)
 {
     if (!psr)
 	return;
@@ -644,7 +644,7 @@ krb5_free_predicted_sam_response(krb5_context ctx,
 
 void KRB5_CALLCONV
 krb5_free_predicted_sam_response_contents(krb5_context ctx,
-				 krb5_predicted_sam_response FAR *psr)
+				 krb5_predicted_sam_response *psr)
 {
     if (!psr)
 	return;
@@ -660,7 +660,7 @@ krb5_free_predicted_sam_response_contents(krb5_context ctx,
 
 void KRB5_CALLCONV
 krb5_free_enc_sam_response_enc(krb5_context ctx,
-			       krb5_enc_sam_response_enc FAR *esre)
+			       krb5_enc_sam_response_enc *esre)
 {
     if (!esre)
 	return;
@@ -670,7 +670,7 @@ krb5_free_enc_sam_response_enc(krb5_context ctx,
 
 void KRB5_CALLCONV
 krb5_free_enc_sam_response_enc_contents(krb5_context ctx,
-			       krb5_enc_sam_response_enc FAR *esre)
+			       krb5_enc_sam_response_enc *esre)
 {
     if (!esre)
 	return;
@@ -679,7 +679,7 @@ krb5_free_enc_sam_response_enc_contents(krb5_context ctx,
 }
 
 void KRB5_CALLCONV
-krb5_free_pa_enc_ts(krb5_context ctx, krb5_pa_enc_ts FAR *pa_enc_ts)
+krb5_free_pa_enc_ts(krb5_context ctx, krb5_pa_enc_ts *pa_enc_ts)
 {
     if (!pa_enc_ts)
 	return;
diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c
index b45f3def5..619881659 100644
--- a/src/lib/krb5/krb/mk_cred.c
+++ b/src/lib/krb5/krb/mk_cred.c
@@ -69,13 +69,13 @@ static krb5_error_code
 krb5_mk_ncred_basic(context, ppcreds, nppcreds, keyblock,                 
 		    replaydata, local_addr, remote_addr, pcred)
     krb5_context 	context;
-    krb5_creds 	        FAR * FAR * ppcreds;
+    krb5_creds 	 ** ppcreds;
     krb5_int32 		nppcreds;
-    krb5_keyblock 	FAR * keyblock;
-    krb5_replay_data    FAR * replaydata;
-    krb5_address  	FAR * local_addr;
-    krb5_address  	FAR * remote_addr;
-    krb5_cred 		FAR * pcred;
+    krb5_keyblock 	 * keyblock;
+    krb5_replay_data * replaydata;
+    krb5_address  	 * local_addr;
+    krb5_address  	 * remote_addr;
+    krb5_cred 		 * pcred;
 {
     krb5_cred_enc_part 	  credenc;
     krb5_error_code	  retval;
@@ -94,8 +94,8 @@ krb5_mk_ncred_basic(context, ppcreds, nppcreds, keyblock,
     credenc.timestamp = replaydata->timestamp;
 
     /* Get memory for creds and initialize it */
-    size = sizeof(krb5_cred_info FAR *) * (nppcreds + 1);
-    credenc.ticket_info = (krb5_cred_info FAR * FAR *) malloc(size);
+    size = sizeof(krb5_cred_info *) * (nppcreds + 1);
+    credenc.ticket_info = (krb5_cred_info **) malloc(size);
     if (credenc.ticket_info == NULL)
 	return ENOMEM;
     memset(credenc.ticket_info, 0, size);
@@ -162,18 +162,18 @@ krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata)
 
     krb5_context 	  context;
     krb5_auth_context	  auth_context;
-    krb5_creds 	       FAR * FAR * ppcreds;
-    krb5_data 	       FAR * FAR * ppdata;
-    krb5_replay_data  	FAR * outdata;
+    krb5_creds 	 ** ppcreds;
+    krb5_data 	 ** ppdata;
+    krb5_replay_data  	 * outdata;
 {
-    krb5_address FAR * premote_fulladdr = NULL;
-    krb5_address FAR * plocal_fulladdr = NULL;
+    krb5_address * premote_fulladdr = NULL;
+    krb5_address * plocal_fulladdr = NULL;
     krb5_address remote_fulladdr;
     krb5_address local_fulladdr;
     krb5_error_code 	retval;
-    krb5_keyblock	FAR * keyblock;
+    krb5_keyblock	 * keyblock;
     krb5_replay_data    replaydata;
-    krb5_cred 		FAR * pcred;
+    krb5_cred 		 * pcred;
     krb5_int32		ncred;
 
     local_fulladdr.contents = 0;
@@ -194,11 +194,11 @@ krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata)
     memset(pcred, 0, sizeof(krb5_cred));
 
     if ((pcred->tickets 
-      = (krb5_ticket FAR * FAR *)malloc(sizeof(krb5_ticket FAR *) * (ncred + 1))) == NULL) {
+      = (krb5_ticket **)malloc(sizeof(krb5_ticket *) * (ncred + 1))) == NULL) {
 	retval = ENOMEM;
 	free(pcred);
     }
-    memset(pcred->tickets, 0, sizeof(krb5_ticket FAR *) * (ncred +1));
+    memset(pcred->tickets, 0, sizeof(krb5_ticket *) * (ncred +1));
 
     /* Get keyblock */
     if ((keyblock = auth_context->local_subkey) == NULL) 
@@ -309,14 +309,14 @@ krb5_error_code KRB5_CALLCONV
 krb5_mk_1cred(context, auth_context, pcreds, ppdata, outdata)
     krb5_context 	  context;
     krb5_auth_context	  auth_context;
-    krb5_creds 		FAR * pcreds;
-    krb5_data 	       FAR * FAR * ppdata;
-    krb5_replay_data  	FAR * outdata;
+    krb5_creds 		 * pcreds;
+    krb5_data 	 ** ppdata;
+    krb5_replay_data  	 * outdata;
 {
     krb5_error_code retval;
-    krb5_creds FAR * FAR *ppcreds;
+    krb5_creds **ppcreds;
 
-    if ((ppcreds = (krb5_creds FAR * FAR *)malloc(sizeof(*ppcreds) * 2)) == NULL) {
+    if ((ppcreds = (krb5_creds **)malloc(sizeof(*ppcreds) * 2)) == NULL) {
 	return ENOMEM;
     }
 
diff --git a/src/lib/krb5/krb/mk_error.c b/src/lib/krb5/krb/mk_error.c
index 4a8858424..bd9519e7d 100644
--- a/src/lib/krb5/krb/mk_error.c
+++ b/src/lib/krb5/krb/mk_error.c
@@ -40,8 +40,8 @@
 krb5_error_code KRB5_CALLCONV
 krb5_mk_error(context, dec_err, enc_err)
     krb5_context context;
-    const krb5_error FAR *dec_err;
-    krb5_data FAR *enc_err;
+    const krb5_error *dec_err;
+    krb5_data *enc_err;
 {
     krb5_error_code retval;
     krb5_data *new_enc_err;
diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c
index 2e2d748bb..13ad61940 100644
--- a/src/lib/krb5/krb/mk_priv.c
+++ b/src/lib/krb5/krb/mk_priv.c
@@ -119,9 +119,9 @@ krb5_error_code KRB5_CALLCONV
 krb5_mk_priv(context, auth_context, userdata, outbuf, outdata)
     krb5_context 	  context;
     krb5_auth_context 	  auth_context;
-    const krb5_data   	FAR * userdata;
-    krb5_data         	FAR * outbuf;
-    krb5_replay_data  	FAR * outdata;
+    const krb5_data   	* userdata;
+    krb5_data         	* outbuf;
+    krb5_replay_data  	* outdata;
 {
     krb5_error_code 	  retval;
     krb5_keyblock       * keyblock;
diff --git a/src/lib/krb5/krb/mk_rep.c b/src/lib/krb5/krb/mk_rep.c
index f0d124e67..ad3e7cc29 100644
--- a/src/lib/krb5/krb/mk_rep.c
+++ b/src/lib/krb5/krb/mk_rep.c
@@ -43,7 +43,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_mk_rep(context, auth_context, outbuf)
     krb5_context 	  context;
     krb5_auth_context	  auth_context;
-    krb5_data 		FAR * outbuf;
+    krb5_data 		* outbuf;
 {
     krb5_error_code 	  retval;
     krb5_ap_rep_enc_part  repl;
diff --git a/src/lib/krb5/krb/mk_req.c b/src/lib/krb5/krb/mk_req.c
index a5e1ffbf6..340b4818f 100644
--- a/src/lib/krb5/krb/mk_req.c
+++ b/src/lib/krb5/krb/mk_req.c
@@ -53,13 +53,13 @@ krb5_error_code KRB5_CALLCONV
 krb5_mk_req(context, auth_context, ap_req_options, service, hostname, in_data,
 	      ccache, outbuf)
     krb5_context          context;
-    krb5_auth_context   FAR * auth_context;
+    krb5_auth_context * auth_context;
     const krb5_flags      ap_req_options;
-    char		FAR * service;
-    char		FAR * hostname;
-    krb5_data           FAR * in_data;
+    char		 * service;
+    char		 * hostname;
+    krb5_data * in_data;
     krb5_ccache 	  ccache;
-    krb5_data 		FAR * outbuf;
+    krb5_data 		 * outbuf;
 {
     krb5_error_code 	  retval;
     krb5_principal	  server;
diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c
index 29238b8d8..8b7b5bb42 100644
--- a/src/lib/krb5/krb/mk_req_ext.c
+++ b/src/lib/krb5/krb/mk_req_ext.c
@@ -74,11 +74,11 @@ krb5_error_code KRB5_CALLCONV
 krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds,
 		     outbuf)
     krb5_context 	  context;
-    krb5_auth_context	FAR * auth_context;
+    krb5_auth_context	* auth_context;
     const krb5_flags 	  ap_req_options;
-    krb5_data		FAR * in_data;
-    krb5_creds 		FAR * in_creds;
-    krb5_data 		FAR * outbuf;
+    krb5_data		* in_data;
+    krb5_creds 		* in_creds;
+    krb5_data 		* outbuf;
 {
     krb5_error_code 	  retval;
     krb5_checksum	  checksum;
diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c
index ffd530ed1..eef712007 100644
--- a/src/lib/krb5/krb/mk_safe.c
+++ b/src/lib/krb5/krb/mk_safe.c
@@ -118,9 +118,9 @@ krb5_error_code KRB5_CALLCONV
 krb5_mk_safe(context, auth_context, userdata, outbuf, outdata)
     krb5_context 	  context;
     krb5_auth_context 	  auth_context;
-    const krb5_data   	FAR * userdata;
-    krb5_data         	FAR * outbuf;
-    krb5_replay_data  	FAR * outdata;
+    const krb5_data   	* userdata;
+    krb5_data         	* outbuf;
+    krb5_replay_data  	* outdata;
 {
     krb5_error_code 	  retval;
     krb5_keyblock       * keyblock;
diff --git a/src/lib/krb5/krb/parse.c b/src/lib/krb5/krb/parse.c
index 0d1b9db75..6aded4050 100644
--- a/src/lib/krb5/krb/parse.c
+++ b/src/lib/krb5/krb/parse.c
@@ -66,8 +66,8 @@
 krb5_error_code KRB5_CALLCONV
 krb5_parse_name(context, name, nprincipal)
     	krb5_context context;
-	const char	FAR *name;
-	krb5_principal	FAR *nprincipal;
+	const char	*name;
+	krb5_principal	*nprincipal;
 {
 	register const char	*cp;
 	register char	*q;
@@ -188,7 +188,7 @@ krb5_parse_name(context, name, nprincipal)
 		else
 			krb5_princ_component(context, principal, i)->length = size;
 		if (i + 1 != components) {
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
+#if !defined(_WIN32) && !defined(macintosh)
 			fprintf(stderr,
 				"Programming error in krb5_parse_name!");
 			exit(1);
diff --git a/src/lib/krb5/krb/preauth.c b/src/lib/krb5/krb/preauth.c
index 54f6a9539..730d25c6a 100644
--- a/src/lib/krb5/krb/preauth.c
+++ b/src/lib/krb5/krb/preauth.c
@@ -33,10 +33,6 @@
 #include <stdio.h>
 #include <time.h>
 #include <syslog.h>
-#ifdef _MSDOS
-#define getpid _getpid
-#include <process.h>
-#endif
 
 static krb5_error_code obtain_enc_ts_padata
 	(krb5_context,
diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c
index 2852e4951..dc8d44253 100644
--- a/src/lib/krb5/krb/rd_cred.c
+++ b/src/lib/krb5/krb/rd_cred.c
@@ -209,9 +209,9 @@ krb5_error_code KRB5_CALLCONV
 krb5_rd_cred(context, auth_context, pcreddata, pppcreds, outdata)
     krb5_context          context;
     krb5_auth_context     auth_context;
-    krb5_data 		FAR * pcreddata;       
-    krb5_creds        FAR * FAR * FAR * pppcreds;
-    krb5_replay_data  	FAR * outdata;
+    krb5_data 		 * pcreddata;       
+    krb5_creds *** pppcreds;
+    krb5_replay_data  	 * outdata;
 {
     krb5_error_code       retval;
     krb5_keyblock       * keyblock;
diff --git a/src/lib/krb5/krb/rd_error.c b/src/lib/krb5/krb/rd_error.c
index 0431fd176..aca18de4a 100644
--- a/src/lib/krb5/krb/rd_error.c
+++ b/src/lib/krb5/krb/rd_error.c
@@ -42,8 +42,8 @@
 krb5_error_code KRB5_CALLCONV
 krb5_rd_error(context,  enc_errbuf, dec_error)
     krb5_context context;
-    const krb5_data FAR *enc_errbuf;
-    krb5_error FAR * FAR *dec_error;
+    const krb5_data *enc_errbuf;
+    krb5_error **dec_error;
 {
     if (!krb5_is_krb_error(enc_errbuf))
 	return KRB5KRB_AP_ERR_MSG_TYPE;
diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c
index 274d0841b..f4adea75f 100644
--- a/src/lib/krb5/krb/rd_priv.c
+++ b/src/lib/krb5/krb/rd_priv.c
@@ -161,9 +161,9 @@ krb5_error_code KRB5_CALLCONV
 krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata)
     krb5_context 	  context;
     krb5_auth_context 	  auth_context;
-    const krb5_data   	FAR * inbuf;
-    krb5_data 	      	FAR * outbuf;
-    krb5_replay_data  	FAR * outdata;
+    const krb5_data   	* inbuf;
+    krb5_data 	      	* outbuf;
+    krb5_replay_data  	* outdata;
 {
     krb5_error_code 	  retval;
     krb5_keyblock       * keyblock;
diff --git a/src/lib/krb5/krb/rd_rep.c b/src/lib/krb5/krb/rd_rep.c
index 14a60b8dd..f6202df82 100644
--- a/src/lib/krb5/krb/rd_rep.c
+++ b/src/lib/krb5/krb/rd_rep.c
@@ -45,8 +45,8 @@ krb5_error_code KRB5_CALLCONV
 krb5_rd_rep(context, auth_context, inbuf, repl)
     krb5_context 	  context;
     krb5_auth_context	  auth_context;
-    const krb5_data 	FAR * inbuf;
-    krb5_ap_rep_enc_part FAR * FAR *repl;
+    const krb5_data 	 * inbuf;
+    krb5_ap_rep_enc_part **repl;
 {
     krb5_error_code 	  retval;
     krb5_ap_rep 	* reply;
diff --git a/src/lib/krb5/krb/rd_req.c b/src/lib/krb5/krb/rd_req.c
index 0c4a605ba..0e64f9637 100644
--- a/src/lib/krb5/krb/rd_req.c
+++ b/src/lib/krb5/krb/rd_req.c
@@ -49,12 +49,12 @@ krb5_error_code KRB5_CALLCONV
 krb5_rd_req(context, auth_context, inbuf, server, keytab, 
 	    ap_req_options, ticket)
     krb5_context 	  context;
-    krb5_auth_context   FAR * auth_context;
-    const krb5_data 	FAR * inbuf;
+    krb5_auth_context * auth_context;
+    const krb5_data 	 * inbuf;
     krb5_const_principal  server;	/* XXX do we really need this */
     krb5_keytab		  keytab;
-    krb5_flags		FAR * ap_req_options;
-    krb5_ticket	       FAR *FAR * ticket;
+    krb5_flags		 * ap_req_options;
+    krb5_ticket	 ** ticket;
 {
     krb5_error_code 	  retval;
     krb5_ap_req 	* request;
diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c
index 7cb7b11b4..a7f87b23d 100644
--- a/src/lib/krb5/krb/rd_safe.c
+++ b/src/lib/krb5/krb/rd_safe.c
@@ -155,9 +155,9 @@ krb5_error_code KRB5_CALLCONV
 krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata)
     krb5_context 	  context;
     krb5_auth_context 	  auth_context;
-    const krb5_data   	FAR * inbuf;
-    krb5_data 	      	FAR * outbuf;
-    krb5_replay_data  	FAR * outdata;
+    const krb5_data   	* inbuf;
+    krb5_data 	      	* outbuf;
+    krb5_replay_data  	* outdata;
 {
     krb5_error_code 	  retval;
     krb5_keyblock	* keyblock;
diff --git a/src/lib/krb5/krb/recvauth.c b/src/lib/krb5/krb/recvauth.c
index 8f81f7287..e7b135704 100644
--- a/src/lib/krb5/krb/recvauth.c
+++ b/src/lib/krb5/krb/recvauth.c
@@ -39,16 +39,16 @@ static char *sendauth_version = "KRB5_SENDAUTH_V1.0";
 
 static krb5_error_code
 recvauth_common(krb5_context context,
-		krb5_auth_context FAR * auth_context,
+		krb5_auth_context * auth_context,
 		/* IN */
 		krb5_pointer fd,
-		char FAR *appl_version,
+		char *appl_version,
 		krb5_principal server,
 		krb5_int32 flags,
 		krb5_keytab keytab,
 		/* OUT */
-		krb5_ticket FAR * FAR * ticket,
-		krb5_data FAR *version)
+		krb5_ticket ** ticket,
+		krb5_data *version)
 {
     krb5_auth_context	  new_auth_context;
     krb5_flags		  ap_option;
@@ -252,13 +252,13 @@ krb5_recvauth(context, auth_context,
 	      /* OUT */
 	      ticket)
     krb5_context 	  context;
-    krb5_auth_context   FAR * auth_context;
+    krb5_auth_context * auth_context;
     krb5_pointer	  fd;
-    char		FAR * appl_version;
+    char		 * appl_version;
     krb5_principal	  server;
     krb5_int32		  flags;
     krb5_keytab		  keytab;
-    krb5_ticket	       FAR * FAR * ticket;
+    krb5_ticket	 ** ticket;
 {
     return recvauth_common (context, auth_context, fd, appl_version,
 			    server, flags, keytab, ticket, 0);
@@ -266,15 +266,15 @@ krb5_recvauth(context, auth_context,
 
 krb5_error_code KRB5_CALLCONV
 krb5_recvauth_version(krb5_context context,
-		      krb5_auth_context FAR *auth_context,
+		      krb5_auth_context *auth_context,
 		      /* IN */
 		      krb5_pointer fd,
 		      krb5_principal server,
 		      krb5_int32 flags,
 		      krb5_keytab keytab,
 		      /* OUT */
-		      krb5_ticket FAR * FAR *ticket,
-		      krb5_data FAR *version)
+		      krb5_ticket **ticket,
+		      krb5_data *version)
 {
     return recvauth_common (context, auth_context, fd, 0,
 			    server, flags, keytab, ticket, version);
diff --git a/src/lib/krb5/krb/sendauth.c b/src/lib/krb5/krb/sendauth.c
index 41479f6d0..0cf0aa654 100644
--- a/src/lib/krb5/krb/sendauth.c
+++ b/src/lib/krb5/krb/sendauth.c
@@ -61,23 +61,23 @@ krb5_sendauth(context, auth_context,
 	      /* OUT */
 	      error, rep_result, out_creds)
     	krb5_context 		  context;
-    	krb5_auth_context       FAR * auth_context;
+    	krb5_auth_context * auth_context;
 	krb5_pointer		  fd;
-	char			FAR * appl_version;
+	char			 * appl_version;
 	krb5_principal		  client;
 	krb5_principal		  server;
 	krb5_flags		  ap_req_options;
-	krb5_data		FAR * in_data;
-	krb5_creds		FAR * in_creds;
+	krb5_data		 * in_data;
+	krb5_creds		 * in_creds;
 	krb5_ccache	  	  ccache;
-	krb5_error             FAR * FAR * error;
-	krb5_ap_rep_enc_part   FAR * FAR * rep_result;
-	krb5_creds	       FAR * FAR * out_creds;
+	krb5_error ** error;
+	krb5_ap_rep_enc_part ** rep_result;
+	krb5_creds	 ** out_creds;
 {
 	krb5_octet		result;
 	krb5_creds 		creds;
-	krb5_creds		FAR * credsp = NULL;
-	krb5_creds		FAR * credspout = NULL;
+	krb5_creds		 * credsp = NULL;
+	krb5_creds		 * credspout = NULL;
 	krb5_error_code		retval = 0;
 	krb5_data		inbuf, outbuf;
 	int			len;
diff --git a/src/lib/krb5/krb/serialize.c b/src/lib/krb5/krb/serialize.c
index 9b80eae9f..968a0ce9c 100644
--- a/src/lib/krb5/krb/serialize.c
+++ b/src/lib/krb5/krb/serialize.c
@@ -120,8 +120,8 @@ krb5_externalize_opaque(kcontext, odtype, arg, bufpp, sizep)
     krb5_context	kcontext;
     krb5_magic		odtype;
     krb5_pointer	arg;
-    krb5_octet		FAR * FAR *bufpp;
-    size_t		FAR *sizep;
+    krb5_octet		 **bufpp;
+    size_t		 *sizep;
 {
     krb5_error_code	kret;
     krb5_ser_handle	shandle;
@@ -180,9 +180,9 @@ krb5_error_code KRB5_CALLCONV
 krb5_internalize_opaque(kcontext, odtype, argp, bufpp, sizep)
     krb5_context	kcontext;
     krb5_magic		odtype;
-    krb5_pointer	FAR *argp;
-    krb5_octet		FAR * FAR *bufpp;
-    size_t		FAR *sizep;
+    krb5_pointer	 *argp;
+    krb5_octet		 **bufpp;
+    size_t		 *sizep;
 {
     krb5_error_code	kret;
     krb5_ser_handle	shandle;
@@ -202,8 +202,8 @@ krb5_internalize_opaque(kcontext, odtype, argp, bufpp, sizep)
 krb5_error_code KRB5_CALLCONV
 krb5_ser_pack_int32(iarg, bufp, remainp)
     krb5_int32		iarg;
-    krb5_octet		FAR * FAR *bufp;
-    size_t		FAR *remainp;
+    krb5_octet		 **bufp;
+    size_t		 *remainp;
 {
     if (*remainp >= sizeof(krb5_int32)) {
 	(*bufp)[0] = (krb5_octet) ((iarg >> 24) & 0xff);
@@ -223,10 +223,10 @@ krb5_ser_pack_int32(iarg, bufp, remainp)
  */
 krb5_error_code KRB5_CALLCONV
 krb5_ser_pack_bytes(ostring, osize, bufp, remainp)
-    krb5_octet	FAR *ostring;
+    krb5_octet	 *ostring;
     size_t	osize;
-    krb5_octet	FAR * FAR *bufp;
-    size_t	FAR *remainp;
+    krb5_octet	 **bufp;
+    size_t	 *remainp;
 {
     if (*remainp >= osize) {
 	memcpy(*bufp, ostring, osize);
@@ -243,9 +243,9 @@ krb5_ser_pack_bytes(ostring, osize, bufp, remainp)
  */
 krb5_error_code KRB5_CALLCONV
 krb5_ser_unpack_int32(intp, bufp, remainp)
-    krb5_int32	FAR *intp;
-    krb5_octet	FAR * FAR *bufp;
-    size_t	FAR *remainp;
+    krb5_int32	 *intp;
+    krb5_octet	 **bufp;
+    size_t	 *remainp;
 {
     if (*remainp >= sizeof(krb5_int32)) {
 	*intp = (((krb5_int32) ((unsigned char) (*bufp)[0]) << 24) |
@@ -265,10 +265,10 @@ krb5_ser_unpack_int32(intp, bufp, remainp)
  */
 krb5_error_code KRB5_CALLCONV
 krb5_ser_unpack_bytes(istring, isize, bufp, remainp)
-    krb5_octet	FAR *istring;
+    krb5_octet	 *istring;
     size_t	isize;
-    krb5_octet	FAR * FAR *bufp;
-    size_t	FAR *remainp;
+    krb5_octet	 **bufp;
+    size_t	 *remainp;
 {
     if (*remainp >= isize) {
 	memcpy(istring, *bufp, isize);
diff --git a/src/lib/krb5/krb/set_realm.c b/src/lib/krb5/krb/set_realm.c
index f60cf9f56..5324e1919 100644
--- a/src/lib/krb5/krb/set_realm.c
+++ b/src/lib/krb5/krb/set_realm.c
@@ -30,7 +30,7 @@ krb5_error_code KRB5_CALLCONV
 krb5_set_principal_realm(context, principal, realm)
     	krb5_context context;
 	krb5_principal	principal;
-	const char	FAR *realm;
+	const char	*realm;
 {
 	size_t	length;
 	char	*newrealm;
diff --git a/src/lib/krb5/krb/str_conv.c b/src/lib/krb5/krb/str_conv.c
index 2a48b2dc2..8296157ec 100644
--- a/src/lib/krb5/krb/str_conv.c
+++ b/src/lib/krb5/krb/str_conv.c
@@ -79,8 +79,8 @@ static const int salttype_table_nents = sizeof(salttype_table)/
 
 krb5_error_code KRB5_CALLCONV
 krb5_string_to_salttype(string, salttypep)
-    char	FAR * string;
-    krb5_int32	FAR * salttypep;
+    char	* string;
+    krb5_int32	* salttypep;
 {
     int i;
     int found;
@@ -105,7 +105,7 @@ krb5_string_to_salttype(string, salttypep)
 krb5_error_code KRB5_CALLCONV
 krb5_salttype_to_string(salttype, buffer, buflen)
     krb5_int32	salttype;
-    char	FAR * buffer;
+    char	* buffer;
     size_t	buflen;
 {
     int i;
@@ -150,8 +150,8 @@ static char *strptime (const char *, const char *, struct tm *);
 
 krb5_error_code KRB5_CALLCONV
 krb5_string_to_timestamp(string, timestampp)
-    char		FAR * string;
-    krb5_timestamp	FAR * timestampp;
+    char		* string;
+    krb5_timestamp	* timestampp;
 {
     int i;
     struct tm timebuf;
@@ -204,7 +204,7 @@ krb5_string_to_timestamp(string, timestampp)
 krb5_error_code KRB5_CALLCONV
 krb5_timestamp_to_string(timestamp, buffer, buflen)
     krb5_timestamp	timestamp;
-    char		FAR * buffer;
+    char		* buffer;
     size_t		buflen;
 {
     int ret;
@@ -221,9 +221,9 @@ krb5_timestamp_to_string(timestamp, buffer, buflen)
 krb5_error_code KRB5_CALLCONV
 krb5_timestamp_to_sfstring(timestamp, buffer, buflen, pad)
     krb5_timestamp	timestamp;
-    char		FAR * buffer;
+    char		* buffer;
     size_t		buflen;
-    char		FAR * pad;
+    char		* pad;
 {
     struct tm	*tmp;
     size_t i;
@@ -269,7 +269,7 @@ krb5_timestamp_to_sfstring(timestamp, buffer, buflen, pad)
 krb5_error_code KRB5_CALLCONV
 krb5_deltat_to_string(deltat, buffer, buflen)
     krb5_deltat	deltat;
-    char	FAR * buffer;
+    char	* buffer;
     size_t	buflen;
 {
     int			days, hours, minutes, seconds;
diff --git a/src/lib/krb5/krb/unparse.c b/src/lib/krb5/krb/unparse.c
index 51b49788d..12755d924 100644
--- a/src/lib/krb5/krb/unparse.c
+++ b/src/lib/krb5/krb/unparse.c
@@ -61,8 +61,8 @@ krb5_error_code KRB5_CALLCONV
 krb5_unparse_name_ext(context, principal, name, size)
     krb5_context context;
     krb5_const_principal principal;
-    register char FAR * FAR *name;
-    unsigned int	FAR *size;
+    register char **name;
+    unsigned int	 *size;
 {
 	register char *cp, *q;
 	register int i,j;
diff --git a/src/lib/krb5/krb/x-deltat.y b/src/lib/krb5/krb/x-deltat.y
index 3305888c8..91da7b945 100644
--- a/src/lib/krb5/krb/x-deltat.y
+++ b/src/lib/krb5/krb/x-deltat.y
@@ -217,8 +217,8 @@ mylex (krb5_int32 *intp, char **pp)
 
 krb5_error_code KRB5_CALLCONV
 krb5_string_to_deltat(string, deltatp)
-    char	FAR * string;
-    krb5_deltat	FAR * deltatp;
+    char	* string;
+    krb5_deltat	* deltatp;
 {
     struct param p;
     p.delta = 0;
diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c
index c3a192bc2..f303046cf 100644
--- a/src/lib/krb5/krb5_libinit.c
+++ b/src/lib/krb5/krb5_libinit.c
@@ -36,7 +36,7 @@ void krb5int_cleanup_library (void)
 {
 	assert (initialized);
 
-#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
 	krb5_stdcc_shutdown();
 #endif
 	
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 67afe3278..b5c0e139e 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,14 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* an_to_ln.c, c_ustime.c, ccdefname.c, init_os_ctx.c, ktdefname.c,
+	kuserok.c, localaddr.c, lock_file.c, prompter.c, promptusr.c,
+	read_pwd.c: Drop _MSDOS support.
+
+	* ccdefname.c, def_realm.c, free_hstrl.c, hst_realm.c,
+	ktdefname.c, localaddr.c, mk_faddr.c, read_pwd.c, sn2princ.c,
+	timeofday.c, ustime.c: Don't explicitly declare pointers FAR any
+	more.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* accessor.c, ccdefname.c, changepw.c, def_realm.c, free_hstrl.c,
diff --git a/src/lib/krb5/os/an_to_ln.c b/src/lib/krb5/os/an_to_ln.c
index b9b0d6079..ffc0ac5b1 100644
--- a/src/lib/krb5/os/an_to_ln.c
+++ b/src/lib/krb5/os/an_to_ln.c
@@ -101,7 +101,7 @@ db_an_to_ln(context, dbname, aname, lnsize, lname)
     const unsigned int lnsize;
     char *lname;
 {
-#if	(!defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh))
+#if	(!defined(_WIN32) && !defined(macintosh))
     DBM *db;
     krb5_error_code retval;
     datum key, contents;
@@ -137,13 +137,13 @@ db_an_to_ln(context, dbname, aname, lnsize, lname)
     /* can't close until we copy the contents. */
     (void) KDBM_CLOSE(db);
     return retval;
-#else	/* !_MSDOS && !_WIN32 && !MACINTOSH */
+#else	/* !_WIN32 && !MACINTOSH */
     /*
      * If we don't have support for a database mechanism, then we can't
      * translate this now, can we?
      */
     return KRB5_LNAME_NOTRANS;
-#endif	/* !_MSDOS && !_WIN32 && !MACINTOSH */
+#endif	/* !_WIN32 && !MACINTOSH */
 }
 #endif /*ANAME_DB*/
 
diff --git a/src/lib/krb5/os/c_ustime.c b/src/lib/krb5/os/c_ustime.c
index 5f735871a..92585a89d 100644
--- a/src/lib/krb5/os/c_ustime.c
+++ b/src/lib/krb5/os/c_ustime.c
@@ -292,127 +292,6 @@ register krb5_int32 *seconds, *microseconds;
     return 0;
 }
 
-#elif defined (_MSDOS)
-
-
-/*
- * Originally written by John Gilmore, Cygnus Support, May '94.
- * Public Domain.
- */
-
-#include <time.h>
-#include <sys/timeb.h>
-#include <dos.h>
-#include <string.h>
-
-/*
- * Time handling.  Translate Unix time calls into Kerberos internal 
- * procedure calls.
- *
- * Due to the fact that DOS time can be unreliable we have reverted
- * to using the AT hardware clock and converting it to Unix time.
- */
-
-static time_t win_gettime ();
-static long win_time_get_epoch();               /* Adjust for MSC 7.00 bug */
-
-krb5_error_code
-krb5_crypto_us_timeofday(seconds, microseconds)
-register krb5_int32 *seconds, *microseconds;
-{
-    krb5_int32 sec, usec;
-    static krb5_int32 last_sec = 0;
-    static krb5_int32 last_usec = 0;
-
-    sec = win_gettime ();                       /* Get the current time */
-    usec = 0;                                   /* Can't do microseconds */
-
-    if (sec == last_sec) {                      /* Same as last time??? */
-        usec = ++last_usec;                     /* Yep, so do microseconds */
-        if (usec >= 1000000) {
-            ++sec;
-            usec = 0;
-        }
-    }
-    last_sec = sec;                             /* Remember for next time */
-    last_usec = usec;
-
-    *seconds = sec;                             /* Return the values */
-    *microseconds = usec;
-
-    return 0;
-}
-
-
-static time_t
-win_gettime () {
-    struct tm tm;
-    union _REGS inregs;                         /* For calling BIOS */
-    union _REGS outregs;
-    struct _timeb now;
-    time_t time;
-    long convert;                               /* MSC 7.00 bug work around */
-
-    _ftime(&now);                               /* Daylight savings time */
-
-    /* Get time from AT hardware clock INT 0x1A, AH=2 */
-    memset(&inregs, 0, sizeof(inregs));
-    inregs.h.ah = 2;
-    _int86(0x1a, &inregs, &outregs);
-
-    /* 0x13 = decimal 13, hence the decoding below */
-    tm.tm_sec = 10 * ((outregs.h.dh & 0xF0) >> 4) + (outregs.h.dh & 0x0F);
-    tm.tm_min = 10 * ((outregs.h.cl & 0xF0) >> 4) + (outregs.h.cl & 0x0F);
-    tm.tm_hour = 10 * ((outregs.h.ch & 0xF0) >> 4) + (outregs.h.ch & 0x0F);
-
-    /* Get date from AT hardware clock INT 0x1A, AH=4 */
-    memset(&inregs, 0, sizeof(inregs));
-    inregs.h.ah = 4;
-    _int86(0x1a, &inregs, &outregs);
-
-    tm.tm_mday = 10 * ((outregs.h.dl & 0xF0) >> 4) + (outregs.h.dl & 0x0F);
-    tm.tm_mon = 10 * ((outregs.h.dh & 0xF0) >> 4) + (outregs.h.dh & 0x0F) - 1;
-    tm.tm_year = 10 * ((outregs.h.cl & 0xF0) >> 4) + (outregs.h.cl & 0x0F);
-    tm.tm_year += 100 * ((10 * (outregs.h.ch & 0xF0) >> 4)
-	            + (outregs.h.ch & 0x0F) - 19);
-
-    tm.tm_wday = 0;
-    tm.tm_yday = 0;
-    tm.tm_isdst = now.dstflag;
-
-    time = mktime(&tm);
-
-    convert = win_time_get_epoch();
-    return time + convert;
-
-}
-
-
-/*
- * This routine figures out the current time epoch and returns the
- * conversion factor.  It exists because 
- * Microloss screwed the pooch on the time() and _ftime() calls in
- * its release 7.0 libraries.  They changed the epoch to Dec 31, 1899!
- * Idiots...   We try to cope.
- */
-
-static struct tm jan_1_70 = {0, 0, 0, 1, 0, 70};
-static long epoch = 0;
-static int epoch_set = 0;
-
-long
-win_time_get_epoch()
-{
-
-    if (!epoch_set) {
-        epoch = 0 - mktime (&jan_1_70);	/* Seconds til 1970 localtime */
-        epoch += _timezone;		/* Seconds til 1970 GMT */
-        epoch_set = 1;
-    }
-    return epoch;
-}
-
-
 #else
 
 
diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c
index 4ed147d13..3556997bb 100644
--- a/src/lib/krb5/os/ccdefname.c
+++ b/src/lib/krb5/os/ccdefname.c
@@ -142,7 +142,7 @@ try_dir(
 }
 #endif
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 static krb5_error_code get_from_os(char *name_buf, int name_size)
 {
 	char *prefix = krb5_cc_dfl_ops->prefix;
@@ -221,7 +221,7 @@ cleanup:
 }
 
 #else
-#if !(defined(_MSDOS) || defined(_WIN32))
+#if !(defined(_WIN32))
 static krb5_error_code get_from_os(char *name_buf, int name_size)
 {
 	sprintf(name_buf, "FILE:/tmp/krb5cc_%ld", (long) getuid());
@@ -276,7 +276,7 @@ krb5_cc_set_default_name(context, name)
 }
 
 	
-const char FAR * KRB5_CALLCONV
+const char * KRB5_CALLCONV
 krb5_cc_default_name(context)
     krb5_context context;
 {
diff --git a/src/lib/krb5/os/def_realm.c b/src/lib/krb5/os/def_realm.c
index 38889f53e..9b9ca49b4 100644
--- a/src/lib/krb5/os/def_realm.c
+++ b/src/lib/krb5/os/def_realm.c
@@ -71,7 +71,7 @@
 krb5_error_code KRB5_CALLCONV
 krb5_get_default_realm(context, lrealm)
     krb5_context context;
-    char FAR * FAR *lrealm;
+    char **lrealm;
 {
     char *realm = 0;
     char *cp;
@@ -209,7 +209,7 @@ krb5_set_default_realm(context, lrealm)
 void KRB5_CALLCONV
 krb5_free_default_realm(context, lrealm)
 	krb5_context context;
-	char FAR* lrealm;
+	char *lrealm;
 {
 	free (lrealm);
 }
diff --git a/src/lib/krb5/os/free_hstrl.c b/src/lib/krb5/os/free_hstrl.c
index 3e5b86990..026cb28b8 100644
--- a/src/lib/krb5/os/free_hstrl.c
+++ b/src/lib/krb5/os/free_hstrl.c
@@ -37,7 +37,7 @@
 krb5_error_code KRB5_CALLCONV
 krb5_free_host_realm(context, realmlist)
     krb5_context context;
-    char FAR * const FAR *realmlist;
+    char * const *realmlist;
 {
     /* same format, so why duplicate code? */
     return krb5_free_krbhst(context, realmlist);
diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index a44c67d71..c973ba3f4 100644
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -235,8 +235,8 @@ krb5_try_realm_txt_rr(prefix, name, realm)
 krb5_error_code KRB5_CALLCONV
 krb5_get_host_realm(context, host, realmsp)
     krb5_context context;
-    const char FAR *host;
-    char FAR * FAR * FAR *realmsp;
+    const char *host;
+    char ***realmsp;
 {
     char **retrealms;
     char *default_realm, *realm, *cp, *temp_realm;
diff --git a/src/lib/krb5/os/init_os_ctx.c b/src/lib/krb5/os/init_os_ctx.c
index c43d1a464..7939cbaa1 100644
--- a/src/lib/krb5/os/init_os_ctx.c
+++ b/src/lib/krb5/os/init_os_ctx.c
@@ -34,7 +34,7 @@
 #include <PreferencesLib.h>
 #endif /* macintosh */
 
-#if !defined(macintosh) && !defined(_MSDOS) && !defined(_WIN32)
+#if !defined(macintosh) && !defined(_WIN32)
 #define USE_RANDOM_DEVICE
 #include <sys/ioctl.h> /* for FIONBIO */
 #ifdef HAVE_SYS_FILIO_H
@@ -42,7 +42,7 @@
 #endif
 #endif
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 
 static krb5_error_code
 get_from_windows_dir(
@@ -173,7 +173,7 @@ get_from_registry(
     return retval;
 }
 
-#endif /* _MSDOS || _WIN32 */
+#endif /* _WIN32 */
 
 static void
 free_filespecs(files)
@@ -287,7 +287,7 @@ os_get_default_config_files(pfiles, secure)
 		return ENOENT;
 	
 #else /* !macintosh */
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
     krb5_error_code retval = 0;
     char *name = 0;
 
@@ -332,7 +332,7 @@ os_get_default_config_files(pfiles, secure)
     files = malloc(2 * sizeof(char *));
     files[0] = name;
     files[1] = 0;
-#else /* !_MSDOS && !_WIN32 */
+#else /* !_WIN32 */
     char* filepath = 0;
     int n_entries, i;
     unsigned int ent_len;
@@ -372,7 +372,7 @@ os_get_default_config_files(pfiles, secure)
     }
     /* cap the array */
     files[i] = 0;
-#endif /* !_MSDOS && !_WIN32 */
+#endif /* !_WIN32 */
 #endif /* !macintosh */
     *pfiles = files;
     return 0;
diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index e2bca91df..18ae376c6 100644
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -39,7 +39,7 @@ char *krb5_overridekeyname = NULL;
 krb5_error_code KRB5_CALLCONV
 krb5_kt_default_name(context, name, namesize)
     krb5_context context;
-    char FAR *name;
+    char *name;
     int namesize;
 {
     char *cp = 0;
@@ -64,7 +64,7 @@ krb5_kt_default_name(context, name, namesize)
 	strcpy(name, retval);
 	profile_release_string(retval);
     } else {
-#if defined (_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 	{
 	    char    defname[160];
 	    int     len;
diff --git a/src/lib/krb5/os/kuserok.c b/src/lib/krb5/os/kuserok.c
index bf3c2968b..b34727cf4 100644
--- a/src/lib/krb5/os/kuserok.c
+++ b/src/lib/krb5/os/kuserok.c
@@ -28,7 +28,7 @@
  */
 
 #include "k5-int.h"
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)    /* Not yet for Windows */
+#if !defined(_WIN32) && !defined(macintosh)    /* Not yet for Windows */
 #include <stdio.h>
 #include <pwd.h>
 
@@ -141,7 +141,7 @@ krb5_kuserok(context, principal, luser)
     return(isok);
 }
 
-#else /* _MSDOS */
+#else /* _WIN32 || macintosh */
 
 /*
  * If the given Kerberos name "server" translates to the same name as "luser"
@@ -163,4 +163,4 @@ krb5_kuserok(context, principal, luser)
 
     return FALSE;
 }
-#endif /* _MSDOS */
+#endif /* _WIN32 || macintosh */
diff --git a/src/lib/krb5/os/localaddr.c b/src/lib/krb5/os/localaddr.c
index d254c6147..021d2b6af 100644
--- a/src/lib/krb5/os/localaddr.c
+++ b/src/lib/krb5/os/localaddr.c
@@ -32,7 +32,7 @@
 #define NEED_SOCKETS
 #include "k5-int.h"
 
-#if !defined(HAVE_MACSOCK_H) && !defined(_MSDOS) && !defined(_WIN32)
+#if !defined(HAVE_MACSOCK_H) && !defined(_WIN32)
 
 /* needed for solaris, harmless elsewhere... */
 #define BSD_COMP
@@ -909,7 +909,7 @@ krb5_os_localaddr_profile (krb5_context context, struct localaddr_data *datap)
 krb5_error_code KRB5_CALLCONV
 krb5_os_localaddr(context, addr)
     krb5_context context;
-    krb5_address FAR * FAR * FAR *addr;
+    krb5_address ***addr;
 {
     struct localaddr_data data = { 0 };
     int r;
@@ -1015,7 +1015,7 @@ krb5_os_localaddr(context, addr)
  * local IP address, courtesy of Windows Socket Network Programming,
  * by Robert Quinn
  */
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 static struct hostent *local_addr_fallback_kludge()
 {
 	static struct hostent	host;
@@ -1038,7 +1038,7 @@ static struct hostent *local_addr_fallback_kludge()
 	if (err == SOCKET_ERROR)
 		return NULL;
 
-	err = getsockname(sock, (LPSOCKADDR) &addr, (int FAR *) size);
+	err = getsockname(sock, (LPSOCKADDR) &addr, (int *) size);
 	if (err == SOCKET_ERROR)
 		return NULL;
 
diff --git a/src/lib/krb5/os/lock_file.c b/src/lib/krb5/os/lock_file.c
index 55f86343a..6cd0ddd7d 100644
--- a/src/lib/krb5/os/lock_file.c
+++ b/src/lib/krb5/os/lock_file.c
@@ -30,7 +30,7 @@
 #include "k5-int.h"
 #include <stdio.h>
 
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(HAVE_MACSOCK_H)
+#if !defined(_WIN32) && !defined(HAVE_MACSOCK_H)
 
 /* Unix version...  */
 
@@ -132,7 +132,7 @@ krb5_lock_file(context, fd, mode)
     
     return retval;
 }
-#else   /* MSDOS or Macintosh */
+#else   /* Windows or Macintosh */
 
 krb5_error_code
 krb5_lock_file(context, fd, mode)
diff --git a/src/lib/krb5/os/mk_faddr.c b/src/lib/krb5/os/mk_faddr.c
index 66167cd96..d40e42ca4 100644
--- a/src/lib/krb5/os/mk_faddr.c
+++ b/src/lib/krb5/os/mk_faddr.c
@@ -41,11 +41,11 @@
 krb5_error_code
 krb5_make_fulladdr(context, kaddr, kport, raddr)
     krb5_context 	context;
-    krb5_address	FAR * kaddr;
-    krb5_address	FAR * kport;
-    krb5_address        FAR * raddr;
+    krb5_address	 * kaddr;
+    krb5_address	 * kport;
+    krb5_address * raddr;
 {
-    register krb5_octet FAR * marshal;
+    register krb5_octet * marshal;
     krb5_int32 tmp32;
     krb5_int16 tmp16;
 
@@ -53,7 +53,7 @@ krb5_make_fulladdr(context, kaddr, kport, raddr)
 	return EINVAL;
 
     raddr->length = kaddr->length + kport->length + (4 * sizeof(krb5_int32));
-    if (!(raddr->contents = (krb5_octet FAR *)malloc(raddr->length)))
+    if (!(raddr->contents = (krb5_octet *)malloc(raddr->length)))
 	return ENOMEM;
 
     raddr->addrtype = ADDRTYPE_ADDRPORT;
diff --git a/src/lib/krb5/os/prompter.c b/src/lib/krb5/os/prompter.c
index 87f0171cc..7a3de40d2 100644
--- a/src/lib/krb5/os/prompter.c
+++ b/src/lib/krb5/os/prompter.c
@@ -1,5 +1,5 @@
 #include "k5-int.h"
-#if !defined(_MSDOS) && (!defined(_WIN32) || (defined(_WIN32) && defined(__CYGWIN32__))) && !defined(macintosh)
+#if (!defined(_WIN32) || (defined(_WIN32) && defined(__CYGWIN32__))) && !defined(macintosh)
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
@@ -131,7 +131,7 @@ cleanup:
 #endif
     return(errcode);
 }
-#else /* MSDOS */
+#else /* non-Cygwin Windows, or Mac */
 
 #if defined(_WIN32)
 
@@ -240,7 +240,7 @@ krb5_prompter_posix(krb5_context context,
     return(EINVAL);
 }
 #endif /* !_WIN32 */
-#endif /* !MSDOS */
+#endif /* Windows or Mac */
 
 void
 krb5int_set_prompt_types(context, types)
diff --git a/src/lib/krb5/os/promptusr.c b/src/lib/krb5/os/promptusr.c
index 3ac3d4f08..1e862b525 100644
--- a/src/lib/krb5/os/promptusr.c
+++ b/src/lib/krb5/os/promptusr.c
@@ -3,7 +3,7 @@
  */
 
 #include "k5-int.h"
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
+#if !defined(_WIN32) && !defined(macintosh)
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c
index 62c7283cc..557e3b65c 100644
--- a/src/lib/krb5/os/read_pwd.c
+++ b/src/lib/krb5/os/read_pwd.c
@@ -29,7 +29,7 @@
 
 #include "k5-int.h"
 
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
+#if !defined(_WIN32) && !defined(macintosh)
 #define DEFINED_KRB5_READ_PASSWORD
 #include <stdio.h>
 #include <errno.h>
@@ -162,7 +162,7 @@ cleanup:
 }
 #endif
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #define DEFINED_KRB5_READ_PASSWORD
 
 #include <io.h>
@@ -287,11 +287,11 @@ cleanup:
 static int CALLBACK
 read_pwd_proc(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    pwd_params FAR *dp;
+    pwd_params *dp;
     
     switch(msg) {
     case WM_INITDIALOG:
-	dp = (pwd_params FAR *) lParam;
+	dp = (pwd_params *) lParam;
 	SetWindowLong(hdlg, DWL_USER, lParam);
 	SetDlgItemText(hdlg, ID_READ_PWD_PROMPT, dp->pwd_prompt);
 	SetDlgItemText(hdlg, ID_READ_PWD_PROMPT2, dp->pwd_prompt2);
@@ -300,7 +300,7 @@ read_pwd_proc(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
 	return TRUE;
 
     case WM_COMMAND:
-	dp = (pwd_params FAR *) GetWindowLong(hdlg, DWL_USER);
+	dp = (pwd_params *) GetWindowLong(hdlg, DWL_USER);
         switch (wParam) {
 	case IDOK:
 	    *(dp->pwd_size_return) =
diff --git a/src/lib/krb5/os/sn2princ.c b/src/lib/krb5/os/sn2princ.c
index a4e1c20c6..ba32c0a23 100644
--- a/src/lib/krb5/os/sn2princ.c
+++ b/src/lib/krb5/os/sn2princ.c
@@ -38,10 +38,10 @@
 krb5_error_code KRB5_CALLCONV
 krb5_sname_to_principal(context, hostname, sname, type, ret_princ)
     krb5_context context;
-    const char FAR * hostname;
-    const char FAR * sname;
+    const char * hostname;
+    const char * sname;
     krb5_int32 type;
-    krb5_principal FAR * ret_princ;
+    krb5_principal * ret_princ;
 {
     struct hostent *hp;
     char **hrealms, *realm, *remote_host;
diff --git a/src/lib/krb5/os/timeofday.c b/src/lib/krb5/os/timeofday.c
index dccfcffb5..143993c4b 100644
--- a/src/lib/krb5/os/timeofday.c
+++ b/src/lib/krb5/os/timeofday.c
@@ -39,7 +39,7 @@ extern int errno;
 krb5_error_code KRB5_CALLCONV
 krb5_timeofday(context, timeret)
     krb5_context context;
-    register krb5_int32 FAR *timeret;
+    register krb5_int32 *timeret;
 {
     krb5_os_context os_ctx = context->os_context;
     time_t tval;
diff --git a/src/lib/krb5/os/ustime.c b/src/lib/krb5/os/ustime.c
index 18b3d4f47..e407e8d95 100644
--- a/src/lib/krb5/os/ustime.c
+++ b/src/lib/krb5/os/ustime.c
@@ -36,8 +36,8 @@
 krb5_error_code KRB5_CALLCONV
 krb5_us_timeofday(context, seconds, microseconds)
     krb5_context context;
-    krb5_int32 FAR *seconds;
-    krb5_int32 FAR *microseconds;
+    krb5_int32 *seconds;
+    krb5_int32 *microseconds;
 {
     krb5_os_context os_ctx = context->os_context;
     krb5_int32 sec, usec;
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index fbc8a6cd3..8ae18837a 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* syslog.c: Drop _MSDOS support.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* sscanf.c: Don't use KRB5_DLLIMP.
diff --git a/src/lib/krb5/posix/syslog.c b/src/lib/krb5/posix/syslog.c
index f7ddbff16..3fff34e42 100644
--- a/src/lib/krb5/posix/syslog.c
+++ b/src/lib/krb5/posix/syslog.c
@@ -33,9 +33,9 @@
  * Modified to use UNIX domain IPC by Ralph Campbell
  */
 
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
+#if !defined(_WIN32) && !defined(macintosh)
 
-#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
+#if defined(__STDC__) || defined(_WIN32)
 #include <stdarg.h>
 #else
 #define const
@@ -63,7 +63,7 @@ static int	LogFacility = LOG_USER;	/* default facility code */
 
 
 void
-#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
+#if defined(__STDC__) || defined(_WIN32)
 syslog(int pri, const char *fmt, ...)
 #else
 syslog(pri, fmt, va_alist)
@@ -74,7 +74,7 @@ syslog(pri, fmt, va_alist)
 {
     va_list pvar;
     void vsyslog();
-#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
+#if defined(__STDC__) || defined(_WIN32)
     va_start(pvar, fmt);
 #else
     va_start(pvar);
@@ -244,7 +244,7 @@ setlogmask(pmask)
 		LogMask = pmask;
 	return (omask);
 }
-#else /* _MSDOS */
+#else /* Windows or Mac */
 
 /* Windows doesn't have the concept of a system log, so just
 ** do nothing here.
diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog
index 8946bc3ee..23c28a3f0 100644
--- a/src/lib/krb5/rcache/ChangeLog
+++ b/src/lib/krb5/rcache/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* rc_io.c: Drop _MSDOS support.
+
+	* rcfns.c: Don't explicitly declare pointers FAR any more.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* ser_rc.c: Don't use KRB5_DLLIMP.
diff --git a/src/lib/krb5/rcache/rc_io.c b/src/lib/krb5/rcache/rc_io.c
index 57fa92961..8cbd6fc82 100644
--- a/src/lib/krb5/rcache/rc_io.c
+++ b/src/lib/krb5/rcache/rc_io.c
@@ -11,7 +11,7 @@
  * I/O functions for the replay cache default implementation.
  */
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #  define PATH_SEPARATOR "\\"
 #else
 #  define PATH_SEPARATOR "/"
@@ -59,7 +59,7 @@ static void
 getdir()
 {
     if (!(dir = getenv("KRB5RCACHEDIR"))) {
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 	if (!(dir = getenv("TEMP")))
 	    if (!(dir = getenv("TMP")))
 		dir = "C:";
@@ -275,7 +275,7 @@ krb5_error_code
 krb5_rc_io_move(krb5_context context, krb5_rc_iostuff *new,
 		krb5_rc_iostuff *old)
 {
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
     char *new_fn = NULL;
     char *old_fn = NULL;
     off_t offset = 0;
@@ -373,7 +373,7 @@ krb5_rc_io_write(krb5_context context, krb5_rc_iostuff *d, krb5_pointer buf,
 krb5_error_code
 krb5_rc_io_sync(krb5_context context, krb5_rc_iostuff *d)
 {
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #ifndef fsync
 #define fsync _commit
 #endif
diff --git a/src/lib/krb5/rcache/rcfns.c b/src/lib/krb5/rcache/rcfns.c
index c19753df7..a98fdd034 100644
--- a/src/lib/krb5/rcache/rcfns.c
+++ b/src/lib/krb5/rcache/rcfns.c
@@ -56,7 +56,7 @@ krb5_rc_close (krb5_context context, krb5_rcache id)
 
 krb5_error_code KRB5_CALLCONV
 krb5_rc_store (krb5_context context, krb5_rcache id,
-	       krb5_donot_replay FAR *dontreplay)
+	       krb5_donot_replay *dontreplay)
 {
     return krb5_x((id)->ops->store,(context, id, dontreplay));
 }
@@ -69,19 +69,19 @@ krb5_rc_expunge (krb5_context context, krb5_rcache id)
 
 krb5_error_code KRB5_CALLCONV
 krb5_rc_get_lifespan (krb5_context context, krb5_rcache id,
-		      krb5_deltat FAR *spanp)
+		      krb5_deltat *spanp)
 {
     return krb5_x((id)->ops->get_span,(context, id, spanp));
 }
 
-char FAR *KRB5_CALLCONV
+char *KRB5_CALLCONV
 krb5_rc_get_name (krb5_context context, krb5_rcache id)
 {
     return krb5_xc((id)->ops->get_name,(context, id));
 }
 
 krb5_error_code KRB5_CALLCONV
-krb5_rc_resolve (krb5_context context, krb5_rcache id, char FAR *name)
+krb5_rc_resolve (krb5_context context, krb5_rcache id, char *name)
 {
     return krb5_x((id)->ops->resolve,(context, id, name));
 }