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

20 files changed, 74 insertions, 123 deletions

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index 687a14e9d..74f19b1d9 100644
--- a/src/util/et/ChangeLog
+++ b/src/util/et/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* com_err.c, com_err.h, compile_et.c, error_message.c,
+	error_table.h, et_c.awk, et_c.perl, et_h.awk, et_h.awk, et_h.perl,
+	etN-ame.c, init_et.c, internal.h, vfprintf.c: Drop NEAR/FAR
+	support and _MSDOS support.
+
 2001-10-03  Ken Raeburn  <raeburn@mit.edu>
 
 	* com_err.c, com_err.h, error_message.c, init_et.c: Don't use
diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c
index 39dc6722d..c59cad7f0 100644
--- a/src/util/et/com_err.c
+++ b/src/util/et/com_err.c
@@ -25,7 +25,7 @@
 #include "com_err.h"
 #include "error_table.h"
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #include <io.h>
 #endif
 #ifdef macintosh
@@ -35,16 +35,16 @@ static void MacMessageBox(char *errbuf);
 
 static /*@null@*/ et_old_error_hook_func com_err_hook = 0;
 
-static void default_com_err_proc (const char FAR *whoami, errcode_t code,
-				  const char FAR *fmt, va_list ap);
+static void default_com_err_proc (const char *whoami, errcode_t code,
+				  const char *fmt, va_list ap);
 
 static void default_com_err_proc(whoami, code, fmt, ap)
-	const char FAR *whoami;
+	const char *whoami;
 	errcode_t code;
-	const char FAR *fmt;
+	const char *fmt;
 	va_list ap;
 {
-#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
 
 	char errbuf[1024] = "";
 
@@ -77,7 +77,7 @@ static void default_com_err_proc(whoami, code, fmt, ap)
 	    MessageBox ((HWND)NULL, errbuf, "Kerberos", MB_ICONEXCLAMATION);
 #endif /* macintosh */
 
-#else /* !_MSDOS && !_WIN32 && !macintosh */
+#else /* !_WIN32 && !macintosh */
     
 	if (whoami) {
 		fputs(whoami, stderr);
@@ -99,9 +99,9 @@ static void default_com_err_proc(whoami, code, fmt, ap)
 }
 
 void KRB5_CALLCONV com_err_va(whoami, code, fmt, ap)
-	const char FAR *whoami;
+	const char *whoami;
 	errcode_t code;
-	const char FAR *fmt;
+	const char *fmt;
 	va_list ap;
 {
 	if (!com_err_hook)
@@ -111,9 +111,9 @@ void KRB5_CALLCONV com_err_va(whoami, code, fmt, ap)
 }
 
 
-void KRB5_CALLCONV_C com_err(const char FAR *whoami,
+void KRB5_CALLCONV_C com_err(const char *whoami,
 					 errcode_t code,
-					 const char FAR *fmt, ...)
+					 const char *fmt, ...)
 {
 	va_list ap;
 
@@ -122,7 +122,7 @@ void KRB5_CALLCONV_C com_err(const char FAR *whoami,
 	va_end(ap);
 }
 
-#if !(defined(_MSDOS)||defined(_WIN32))
+#if !(defined(_WIN32))
 et_old_error_hook_func set_com_err_hook (new_proc)
 	et_old_error_hook_func new_proc;
 {
diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index 9af011c11..547601a69 100644
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -12,7 +12,7 @@
 
 #ifndef __COM_ERR_H
 
-#if defined(_MSDOS) || defined(_WIN32) || defined(macintosh)
+#if defined(_WIN32) || defined(macintosh)
 #include <win-mac.h>
 #endif
 
@@ -26,19 +26,14 @@
 #define KRB5_EXPORTVAR
 #endif
 
-#ifndef FAR
-#define FAR
-#define NEAR
-#endif
-
 #include <stdarg.h>
 
 typedef long errcode_t;
-typedef void (*et_old_error_hook_func) (const char FAR *, errcode_t,
-					const char FAR *, va_list ap);
+typedef void (*et_old_error_hook_func) (const char *, errcode_t,
+					const char *, va_list ap);
 	
 struct error_table {
-	/*@shared@*/ char const FAR * const FAR * msgs;
+	/*@shared@*/ char const * const * msgs;
         long base;
 	unsigned int n_msgs;
 };
@@ -49,21 +44,21 @@ extern "C" {
 
 /* Public interfaces */
 extern void KRB5_CALLCONV_C com_err
-	(const char FAR *, errcode_t, const char FAR *, ...);
+	(const char *, errcode_t, const char *, ...);
 extern void KRB5_CALLCONV com_err_va
-	(const char FAR *whoami, errcode_t code, const char FAR *fmt,
+	(const char *whoami, errcode_t code, const char *fmt,
 	 va_list ap);
-extern /*@observer@*//*@dependent@*/ const char FAR * KRB5_CALLCONV error_message
+extern /*@observer@*//*@dependent@*/ const char * KRB5_CALLCONV error_message
 	(errcode_t)
        /*@modifies internalState@*/;
 extern errcode_t KRB5_CALLCONV add_error_table
-	(/*@dependent@*/ const struct error_table FAR *)
+	(/*@dependent@*/ const struct error_table *)
        /*@modifies internalState@*/;
 extern errcode_t KRB5_CALLCONV remove_error_table
-	(const struct error_table FAR *)
+	(const struct error_table *)
        /*@modifies internalState@*/;
 
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
+#if !defined(_WIN32) && !defined(macintosh)
 /*
  * The display routine should be application specific.  A global hook,
  * may cause inappropriate display procedures to be called between
diff --git a/src/util/et/compile_et.c b/src/util/et/compile_et.c
index 20239312e..23771a0a7 100644
--- a/src/util/et/compile_et.c
+++ b/src/util/et/compile_et.c
@@ -76,7 +76,7 @@ static const char * const c_src_prolog[] = {
 };
 
 static const char * const krc_src_prolog[] = {
-    "#if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)\n",
+    "#if defined(__STDC__) || defined(_WIN32)\n",
     "#define NOARGS void\n",
     "#else\n",
     "#define NOARGS\n",
diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c
index 48c9b1fad..827b52aa7 100644
--- a/src/util/et/error_message.c
+++ b/src/util/et/error_message.c
@@ -31,7 +31,7 @@
 #include <ErrorLib.h>
 #endif
 
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 #define HAVE_STRERROR
 #endif
 
@@ -48,7 +48,7 @@ extern const int sys_nerr;
 
 static char buffer[ET_EBUFSIZ];
 
-#if (defined(_MSDOS) || defined(_WIN32) || defined(macintosh))
+#if (defined(_WIN32) || defined(macintosh))
 /*@null@*/ static struct et_list * _et_list = (struct et_list *) NULL;
 #else
 /* Old interface compatibility */
@@ -57,24 +57,13 @@ static char buffer[ET_EBUFSIZ];
 
 /*@null@*//*@only@*/static struct dynamic_et_list * et_list_dynamic;
 
-#ifdef _MSDOS
-/*
- * Win16 applications cannot call malloc while the DLL is being
- * initialized...  To get around this, we pre-allocate an array
- * sufficient to hold several error tables.
- */
-#define PREALLOCATE_ETL 32
-static struct et_list etl[PREALLOCATE_ETL];
-static int etl_used = 0;
-#endif
-
 #ifndef DEBUG_TABLE_LIST
 #define dprintf(X)
 #else
 #define dprintf(X) printf X
 #endif
 
-const char FAR * KRB5_CALLCONV
+const char * KRB5_CALLCONV
 error_message(long code)
     /*@modifies internalState@*/
 {
@@ -161,7 +150,7 @@ error_message(long code)
 	return table->msgs[offset];
 
  no_table_found:
-#if defined(_MSDOS) || defined(_WIN32)
+#if defined(_WIN32)
 	/*
 	 * WinSock errors exist in the 10000 and 11000 ranges
 	 * but might not appear if WinSock is not initialized
@@ -243,26 +232,12 @@ oops:
 
 /*@-incondefs@*/ /* _et_list is global on unix but not in header annotations */
 errcode_t KRB5_CALLCONV
-add_error_table(/*@dependent@*/ const struct error_table FAR * et)
-#ifndef _MSDOS
+add_error_table(/*@dependent@*/ const struct error_table * et)
      /*@modifies _et_list,et_list_dynamic@*/
-#else
-     /*@modifies _et_list,et_list_dynamic,etl_used,etl@*/
-#endif
 /*@=incondefs@*/
 {
     struct dynamic_et_list *del;
 
-#ifdef _MSDOS
-    if (etl_used < PREALLOCATE_ETL) {
-	el = &etl[etl_used++];
-	el->table = et;
-	el->next = _et_list;
-	et_list = el;
-	return 0;
-    }
-#endif
-
     del = (struct dynamic_et_list *)malloc(sizeof(struct dynamic_et_list));
     if (del == NULL)
 	return errno;
@@ -275,12 +250,8 @@ add_error_table(/*@dependent@*/ const struct error_table FAR * et)
 
 /*@-incondefs@*/ /* _et_list is global on unix but not in header annotations */
 errcode_t KRB5_CALLCONV
-remove_error_table(const struct error_table FAR * et)
-#ifdef _MSDOS
-     /*@modifies _et_list,et_list_dynamic,etl_used,etl@*/
-#else
+remove_error_table(const struct error_table * et)
      /*@modifies _et_list,et_list_dynamic@*/
-#endif
 /*@=incondefs@*/
 {
     struct dynamic_et_list **del;
@@ -301,10 +272,6 @@ remove_error_table(const struct error_table FAR * et)
 	    *el = old->next;
 	    old->next = NULL;
 	    old->table = NULL;
-#ifdef _MSDOS
-	    if ((old >= etl) && (old < &etl[PREALLOCATE_ETL-1]))
-		/* do something? */;
-#endif
 	    return 0;
 	}
     return ENOENT;
diff --git a/src/util/et/error_table.h b/src/util/et/error_table.h
index 6c32f6a9b..d30457d3f 100644
--- a/src/util/et/error_table.h
+++ b/src/util/et/error_table.h
@@ -17,25 +17,25 @@
 
 struct et_list {
     /*@dependent@*//*@null@*/ struct et_list *next;
-    /*@dependent@*//*@null@*/ const struct error_table FAR *table;
+    /*@dependent@*//*@null@*/ const struct error_table *table;
 };
-#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)
+#if !defined(_WIN32) && !defined(macintosh)
 /*@null@*//*@dependent@*/ extern struct et_list * _et_list;
 #endif
 
 struct dynamic_et_list {
     /*@only@*//*@null@*/ struct dynamic_et_list *next;
-    /*@dependent@*/ const struct error_table FAR *table;
+    /*@dependent@*/ const struct error_table *table;
 };
 
 #define	ERRCODE_RANGE	8	/* # of bits to shift table number */
 #define	BITS_PER_CHAR	6	/* # bits to shift per character in name */
 #define ERRCODE_MAX   0xFFFFFFFFUL      /* Mask for maximum error table */
 
-extern /*@observer@*/ const char FAR *error_table_name (unsigned long)
+extern /*@observer@*/ const char *error_table_name (unsigned long)
      /*@modifies internalState@*/;
-extern const char FAR *error_table_name_r (unsigned long,
-					   /*@out@*/ /*@returned@*/ char FAR *outbuf)
+extern const char *error_table_name_r (unsigned long,
+					   /*@out@*/ /*@returned@*/ char *outbuf)
      /*@modifies outbuf@*/;
 
 #define _ET_H
diff --git a/src/util/et/et_c.awk b/src/util/et/et_c.awk
index 5e55235e3..023c831c3 100644
--- a/src/util/et/et_c.awk
+++ b/src/util/et/et_c.awk
@@ -109,10 +109,8 @@ c2n["_"]=63
 	print " * This file is automatically generated; please do not edit it." > outfile
 	print " */" > outfile
 
-	print "#if defined(_MSDOS) || defined(_WIN32)" > outfile
+	print "#if defined(_WIN32)" > outfile
 	print "# include \"win-mac.h\"" > outfile
-	print "#else" > outfile
-	print "# define FAR" > outfile
 	print "#endif" > outfile
 	print "" > outfile
 	print "extern void initialize_" table_name "_error_table (void);" > outfile
@@ -121,7 +119,7 @@ c2n["_"]=63
 	print "   properly, so we need this typedef in each" > outfile
 	print "   generated .c file.  */" > outfile
 	print "/*@-redef@*/" > outfile
-	print "typedef /*@null@*/ const char FAR *ncptr;" > outfile
+	print "typedef /*@null@*/ const char *ncptr;" > outfile
 	print "/*@=redef@*/" > outfile
 	print "" > outfile
 	print "static ncptr const text[] = {" > outfile
@@ -199,7 +197,7 @@ END {
 		tab_base_low, table_item_count) > outfile
 	}
 	print "" > outfile
-	print "#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)" > outfile
+	print "#if !defined(_WIN32) && !defined(macintosh)" > outfile
 	print "void initialize_" table_name "_error_table (void)" > outfile
 	print "    /*@modifies internalState@*/" > outfile
 	print "{" > outfile
diff --git a/src/util/et/et_c.perl b/src/util/et/et_c.perl
index b097eaaf6..ad85ec759 100644
--- a/src/util/et/et_c.perl
+++ b/src/util/et/et_c.perl
@@ -79,7 +79,7 @@ $c2n{'9'} = 62;
 $c2n{'_'} = 63;
 
 line: while (<>) {
-    chop;	# strip record separator
+    chomp;	# strip record separator
     @Fld = split($FS, $_, 9999);
     if (/^#/) {
 	next line;
@@ -137,14 +137,10 @@ line: while (<>) {
 	    (print $fh ' */');
 
 	&Pick('>', $outfile) &&
-	    (print $fh '#if defined(_MSDOS) || defined(_WIN32)');
+	    (print $fh '#if defined(_WIN32)');
 	&Pick('>', $outfile) &&
 	    (print $fh "# include \"win-mac.h\"");
 	&Pick('>', $outfile) &&
-	    (print $fh '#else');
-	&Pick('>', $outfile) &&
-	    (print $fh '# define FAR');
-	&Pick('>', $outfile) &&
 	    (print $fh '#endif');
 	&Pick('>', $outfile) &&
 	    (print $fh '');
@@ -163,7 +159,7 @@ line: while (<>) {
 	&Pick('>', $outfile) &&
 	    (print $fh '/*@-redef@*/');
 	&Pick('>', $outfile) &&
-	    (print $fh 'typedef /*@null@*/ const char FAR *ncptr;');
+	    (print $fh 'typedef /*@null@*/ const char *ncptr;');
 	&Pick('>', $outfile) &&
 	    (print $fh '/*@=redef@*/');
 	&Pick('>', $outfile) &&
@@ -262,7 +258,7 @@ else {
 &Pick('>', $outfile) &&
     (print $fh
 
-      '#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)');
+      '#if !defined(_WIN32) && !defined(macintosh)');
 &Pick('>', $outfile) &&
     (print $fh 'void initialize_' . $table_name . '_error_table (void)');
 &Pick('>', $outfile) &&
diff --git a/src/util/et/et_h.awk b/src/util/et/et_h.awk
index 19bdcc05a..2cea1532d 100644
--- a/src/util/et/et_h.awk
+++ b/src/util/et/et_h.awk
@@ -148,7 +148,7 @@ END {
 	print "" > outfile
 	print "extern struct error_table et_" table_name "_error_table;" > outfile
 	print "" > outfile
-	print "#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)" > outfile
+	print "#if !defined(_WIN32) && !defined(macintosh)" > outfile
 	print "/* for compatibility with older versions... */" > outfile
 	print "extern void initialize_" table_name "_error_table () /*@modifies internalState@*/;" > outfile
 	print "#define init_" table_name "_err_tbl initialize_" table_name "_error_table" > outfile
diff --git a/src/util/et/et_h.perl b/src/util/et/et_h.perl
index 0b2ee1f23..5789617a4 100644
--- a/src/util/et/et_h.perl
+++ b/src/util/et/et_h.perl
@@ -194,7 +194,7 @@ else {
 &Pick('>', $outfile) &&
     (print $fh
 
-      '#if !defined(_MSDOS) && !defined(_WIN32) && !defined(macintosh)');
+      '#if !defined(_WIN32) && !defined(macintosh)');
 &Pick('>', $outfile) &&
     (print $fh '/* for compatibility with older versions... */');
 &Pick('>', $outfile) &&
diff --git a/src/util/et/et_name.c b/src/util/et/et_name.c
index 788170735..64923c998 100644
--- a/src/util/et/et_name.c
+++ b/src/util/et/et_name.c
@@ -27,7 +27,7 @@ static const char char_set[] =
 
 const char *
 error_table_name_r (unsigned long num,
-		    /*@out@*/ /*@returned@*/ char FAR *outbuf)
+		    /*@out@*/ /*@returned@*/ char *outbuf)
      /*@modifies outbuf@*/
 {
 	long ch;
@@ -47,7 +47,7 @@ error_table_name_r (unsigned long num,
 }
 
 /*@observer@*/
-const char FAR * error_table_name(unsigned long num)
+const char * error_table_name(unsigned long num)
      /*@modifies internalState@*/
 {
 	static char buf[6];
diff --git a/src/util/et/init_et.c b/src/util/et/init_et.c
index c47acb7bb..b0a406403 100644
--- a/src/util/et/init_et.c
+++ b/src/util/et/init_et.c
@@ -36,11 +36,11 @@ struct foobar {
 };
 
 int init_error_table(msgs, base, count)
-    const char FAR * const FAR * msgs;
+    const char * const * msgs;
     int base;
     int count;
 {
-    struct foobar FAR * new_et;
+    struct foobar * new_et;
 
     if (!base || !count || !msgs)
 	return 0;
@@ -59,9 +59,9 @@ int init_error_table(msgs, base, count)
 }
 
 extern errcode_t KRB5_CALLCONV et_init(ectx)
-	et_ctx FAR *ectx;
+	et_ctx *ectx;
 {
-	struct et_context FAR *ctx;
+	struct et_context *ctx;
 
 	ctx = malloc(sizeof(struct et_context));
 	if (!ctx)
@@ -77,7 +77,7 @@ extern errcode_t KRB5_CALLCONV et_init(ectx)
 extern void KRB5_CALLCONV et_shutdown(ectx)
 	et_ctx ectx;	
 {
-	struct et_list FAR *p, FAR *n;
+	struct et_list *p, *n;
 
 	p = ectx->tables;
 	while (p) {
@@ -90,9 +90,9 @@ extern void KRB5_CALLCONV et_shutdown(ectx)
 
 extern errcode_t KRB5_CALLCONV et_add_error_table(ectx, tbl)
 	et_ctx ectx;
-	struct error_table FAR *tbl;
+	struct error_table *tbl;
 {
-	struct et_list FAR *e;
+	struct et_list *e;
 
 	e = malloc(sizeof(struct et_list));
 	if (!e)
diff --git a/src/util/et/internal.h b/src/util/et/internal.h
index c786a33a5..57b5cd58e 100644
--- a/src/util/et/internal.h
+++ b/src/util/et/internal.h
@@ -10,6 +10,6 @@ extern char const * const sys_errlist[];
 extern const int sys_nerr;
 #endif
 
-#if defined(__STDC__) && !defined(HDR_HAS_PERROR) && !defined(_MSDOS) && !defined(WIN32)
+#if defined(__STDC__) && !defined(HDR_HAS_PERROR) && !defined(WIN32)
 void perror (const char *);
 #endif
diff --git a/src/util/et/vfprintf.c b/src/util/et/vfprintf.c
index 567d40225..af108256b 100644
--- a/src/util/et/vfprintf.c
+++ b/src/util/et/vfprintf.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #if !defined(macintosh)
-#if defined(HAVE_STDARG_H) || defined(_MSDOS) || defined(_WIN32)
+#if defined(HAVE_STDARG_H) || defined(_WIN32)
 #include <stdarg.h>
 #else
 #include <varargs.h>
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";