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

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

6 files changed, 12 insertions, 24 deletions

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index a9d6f8a65..0b77845bf 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* prof_file.c, prof_int.h, prof_parse.c, profile.hin,
+	test_profile.c: Drop _MSDOS support.
+
+	* profile.hin (NEAR, FAR): Don't define.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* prof_get.c, prof_init.c, prof_set.c, profile.hin: Don't use
diff --git a/src/util/profile/prof_file.c b/src/util/profile/prof_file.c
index 83f447729..52fc5bbf7 100644
--- a/src/util/profile/prof_file.c
+++ b/src/util/profile/prof_file.c
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #include <io.h>
 #define HAVE_STAT	
 #define stat _stat
diff --git a/src/util/profile/prof_int.h b/src/util/profile/prof_int.h
index 0ee1f65f1..3d24f23c3 100644
--- a/src/util/profile/prof_int.h
+++ b/src/util/profile/prof_int.h
@@ -7,19 +7,12 @@
 #include "prof_err.h"
 #include "profile.h"
 
-#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
+#if defined(__STDC__) || defined(_WIN32)
 #define PROTOTYPE(x) x
 #else
 #define PROTOTYPE(x) ()
 #endif
 
-#if defined(_MSDOS)
-/* From k5-config.h */
-#define SIZEOF_INT      2
-#define SIZEOF_SHORT    2
-#define SIZEOF_LONG     4
-#endif 
-
 #if defined(_WIN32)
 #define SIZEOF_INT      4
 #define SIZEOF_SHORT    2
diff --git a/src/util/profile/prof_parse.c b/src/util/profile/prof_parse.c
index e1645ecd7..844d66a57 100644
--- a/src/util/profile/prof_parse.c
+++ b/src/util/profile/prof_parse.c
@@ -311,7 +311,7 @@ static void output_quoted_string(str, f)
 
 
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #define EOL "\r\n"
 #endif
 
diff --git a/src/util/profile/profile.hin b/src/util/profile/profile.hin
index fc368b1a8..592bc4887 100644
--- a/src/util/profile/profile.hin
+++ b/src/util/profile/profile.hin
@@ -5,7 +5,7 @@
 #ifndef _KRB5_PROFILE_H
 #define _KRB5_PROFILE_H
 
-#if defined(_MSDOS) || defined(_WIN32) || defined(MACINTOSH)
+#if defined(_WIN32) || defined(MACINTOSH)
 #include <win-mac.h>
 #endif
 
@@ -13,14 +13,12 @@
 #define KRB5_CALLCONV
 #define KRB5_CALLCONV_C
 #define KRB5_EXPORTVAR
-#define FAR
-#define NEAR
 #endif
 
 typedef struct _profile_t *profile_t;
 
 #if !defined(PROTOTYPE)
-#if defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32)
+#if defined(__STDC__) || defined(__cplusplus) || defined(_WIN32)
 #define PROTOTYPE(x) x
 #else
 #define PROTOTYPE(x) ()
diff --git a/src/util/profile/test_profile.c b/src/util/profile/test_profile.c
index f23a66a60..5ed881561 100644
--- a/src/util/profile/test_profile.c
+++ b/src/util/profile/test_profile.c
@@ -10,17 +10,7 @@
 
 #include "prof_int.h"
 #include "argv_parse.h"
-#ifndef _MSDOS
 #include "com_err.h"
-#else
-
-/* Stubs for the error handling routines */
-#include "prof_int.h"
-void initialize_prof_error_table() {}
-void com_err (char *fmt, long err, char *msg) {
-    printf (fmt, err, msg);
-}
-#endif
 
 const char *program_name = "test_profile";