diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-07-08 17:22:24 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-07-08 17:22:24 +0000 |
| commit | 0b3ec0d3e5f2b0b0e379e0a6e51c6e4e4d109b93 (patch) | |
| tree | 3b608e07da7764ae8090f38c783137ea16019fdc /src/util | |
| parent | c0f8677c12000388ae8466f532246948501a5e3f (diff) | |
| download | krb5-0b3ec0d3e5f2b0b0e379e0a6e51c6e4e4d109b93.tar.gz krb5-0b3ec0d3e5f2b0b0e379e0a6e51c6e4e4d109b93.tar.xz krb5-0b3ec0d3e5f2b0b0e379e0a6e51c6e4e4d109b93.zip | |
* et_c.awk: Fix up <com_err.h> inclusion for windows and mac
* et_c.pl: Regenerate.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14614 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/et/ChangeLog | 6 | ||||
| -rw-r--r-- | src/util/et/et_c.awk | 6 | ||||
| -rw-r--r-- | src/util/et/et_c.pl | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index 4b767f953c..14376b76e4 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -1,3 +1,9 @@ +2002-07-08 Tom Yu <tlyu@mit.edu> + + * et_c.awk: Fix up <com_err.h> inclusion for windows and mac. + + * et_c.pl: Regenerate. + 2002-07-03 Tom Yu <tlyu@mit.edu> * Makefile.in: Fix rebuild rules et_?.perl -> et_?.pl. Also, diff --git a/src/util/et/et_c.awk b/src/util/et/et_c.awk index 10662b6e50..0305bafc22 100644 --- a/src/util/et/et_c.awk +++ b/src/util/et/et_c.awk @@ -187,9 +187,11 @@ END { print " 0" > outfile print "};" > outfile print "" > outfile - print "#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))" > outfile + print "#if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))" > outfile + print "#include <KerberosComErr/KerberosComErr.h>" > outfile + print "#else" > outfile print "#include <com_err.h>" > outfile - print "#endif" > outfile + print "#endif" > outfile print "" > outfile if (tab_base_high == 0) { print "const struct error_table et_" table_name "_error_table = { text, " \ diff --git a/src/util/et/et_c.pl b/src/util/et/et_c.pl index fff4a56ffa..b512252c6b 100644 --- a/src/util/et/et_c.pl +++ b/src/util/et/et_c.pl @@ -241,7 +241,11 @@ line: while (<>) { &Pick('>', $outfile) && (print $fh - '#if !defined(_WIN32) && !defined(macintosh) && !(defined(__MACH__) && defined(__APPLE__))'); + '#if defined(macintosh) || (defined(__MACH__) && defined(__APPLE__))'); +&Pick('>', $outfile) && + (print $fh '#include <KerberosComErr/KerberosComErr.h>'); +&Pick('>', $outfile) && + (print $fh '#else'); &Pick('>', $outfile) && (print $fh '#include <com_err.h>'); &Pick('>', $outfile) && |