prof_int.h: Include "com_err.h" instead of redeclaring errcode_t

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

diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog
index c0b3c0cf3d87fc081c63ca2271e1a4bab2f9c8d4..274bb8a50dff5cd50f2573592a12cbadb37f5a73 100644 (file)
--- a/src/util/profile/ChangeLog
+++ b/src/util/profile/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb  7 18:56:57 1997  Richard Basch  <basch@lehman.com>
+
+       * prof_int.h:
+               Include com_err.h rather than redefining errcode_t
+               Structure element "magic" should not be errcode_t
+
 Wed Feb  5 20:18:33 1997  Richard Basch  <basch@lehman.com>
 
        * profile.hin: Do not process the contents of profile.h

diff --git a/src/util/profile/prof_int.h b/src/util/profile/prof_int.h
index 4fd122eee183e946475dc7e5e7c17d4d7093d840..89e7017f1781e2026db11fb9a067b6a56b1f87e6 100644 (file)
--- a/src/util/profile/prof_int.h
+++ b/src/util/profile/prof_int.h
@@ -3,6 +3,7 @@
  */
 
 #include <time.h>
+#include "com_err.h"
 #include "prof_err.h"
 
 #if defined(__STDC__) || defined(_MSDOS) || defined(_WIN32)
@@ -29,19 +30,19 @@
 #define NO_SYS_STAT_H
 #endif
 
-typedef long errcode_t;
+typedef long prf_magic_t;
 
 /*
  * This is the structure which stores the profile information for a
  * particular configuration file.
  */
 struct _prf_file_t {
-       errcode_t       magic;
-       char    *comment;
-       char    *filename;
+       prf_magic_t     magic;
+       char            *comment;
+       char            *filename;
        struct profile_node *root;
-       time_t  timestamp;
-       int     flags;
+       time_t          timestamp;
+       int             flags;
        struct _prf_file_t *next;
 };
 
@@ -53,7 +54,7 @@ typedef struct _prf_file_t *prf_file_t;
  * configuration file(s)
  */
 struct _profile_t {
-       errcode_t       magic;
+       prf_magic_t     magic;
        prf_file_t      first_file;
 };
 
@@ -64,7 +65,7 @@ typedef struct _profile_t *profile_t;
  * returned to the user when a section is searched.
  */
 struct _profile_section_t {
-       errcode_t       magic;
+       prf_magic_t     magic;
        int             top_lvl:1, top_lvl_search:1;
        char            *name;
        void            *state;
@@ -135,10 +136,10 @@ extern errcode_t profile_close_file
 
 /* prof_init.c */
 
-errcode_t profile_init
+extern errcode_t profile_init
        PROTOTYPE ((const char **filenames, profile_t *ret_profile));
 
-errcode_t profile_init_path
+extern errcode_t profile_init_path
        PROTOTYPE ((const char *filepath, profile_t *ret_profile));
 
 extern void profile_release