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 f27c74c8006b6b033959dd5259affaed27b186cc..c0b3c0cf3d87fc081c63ca2271e1a4bab2f9c8d4 100644 (file)
--- 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 e0fee5ba52c291d7c09eb9961336e5f8a67e473b..039e6d7dba14254860544a7ec347e117ff4c8e55 100644 (file)
--- 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 7fd86e9127de25cea23e26c58d9c73e3afe12cf3..accd04aa9ed22b0ed45edcae553b328d9eedc6b4 100644 (file)
--- 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)