From: Richard Basch <probe@mit.edu>
Date: Thu, 6 Feb 1997 04:11:41 +0000 (+0000)
Subject: profile.hin: Do not multiply process the contents of this file
X-Git-Tag: krb5-1.1-beta1~1379
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4335419bb918d71eec30a48e4289ad6462f02819;p=krb5.git

profile.hin: Do not multiply process the contents of this file
test_parse.c: Do not include "com_err.h" (typedef conflict)

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

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index f27c74c80..c0b3c0cf3 100644
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,5 +1,11 @@
 Wed Feb  5 20:18:33 1997  Richard Basch  <basch@lehman.com>
 
+	* profile.hin: Do not process the contents of profile.h
+		(or the profile.hin subset) more than once.
+
+	* test_parse.c:
+		Do not include "com_err.h" (conflicting errcode_t definition)
+
 	* Makefile.in:
 		Fixed typo (all-max -> all-mac)
 		Inconsistent colon usage; all-windows needed :: not :
diff --git a/src/util/profile/profile.hin b/src/util/profile/profile.hin
index e0fee5ba5..039e6d7db 100644
--- a/src/util/profile/profile.hin
+++ b/src/util/profile/profile.hin
@@ -2,6 +2,9 @@
  * profile.h
  */
 
+#ifndef _KRB5_PROFILE_H
+#define _KRB5_PROFILE_H
+
 typedef struct _profile_t *profile_t;
 
 #if !defined(PROTOTYPE)
@@ -32,3 +35,4 @@ extern long profile_get_integer
 			const char *subsubname, int def_val,
 			int *ret_default));
 
+#endif /* _KRB5_PROFILE_H */
diff --git a/src/util/profile/test_parse.c b/src/util/profile/test_parse.c
index 7fd86e912..accd04aa9 100644
--- a/src/util/profile/test_parse.c
+++ b/src/util/profile/test_parse.c
@@ -8,19 +8,6 @@
 
 #include "prof_int.h"
 
-#if !defined(_MSDOS) && !defined(_MACINTOSH)
-#include "com_err.h"
-#else
-
-#define initialize_prof_error_table()
-char *error_message (long err) {
-	static char buf[50];
-
-	sprintf (buf, " 0x%lX (%ld)", err, err);
-	return buf;
-}
-#endif
-
 void dump_profile PROTOTYPE((struct profile_node *root, int level));
 
 int main(argc, argv)