diff options
| author | Richard Basch <probe@mit.edu> | 1997-02-06 04:11:41 +0000 |
|---|---|---|
| committer | Richard Basch <probe@mit.edu> | 1997-02-06 04:11:41 +0000 |
| commit | 4335419bb918d71eec30a48e4289ad6462f02819 (patch) | |
| tree | f58ad52767ef7cc0bdac6d9148a6d6c5bbad6a85 /src | |
| parent | 1179301381a47e5c389122f698f7c1e666ba5d5d (diff) | |
| download | krb5-4335419bb918d71eec30a48e4289ad6462f02819.tar.gz krb5-4335419bb918d71eec30a48e4289ad6462f02819.tar.xz krb5-4335419bb918d71eec30a48e4289ad6462f02819.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/profile/ChangeLog | 6 | ||||
| -rw-r--r-- | src/util/profile/profile.hin | 4 | ||||
| -rw-r--r-- | src/util/profile/test_parse.c | 13 |
3 files changed, 10 insertions, 13 deletions
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) |