diff options
| author | Sam Hartman <hartmans@mit.edu> | 1997-02-22 08:04:28 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 1997-02-22 08:04:28 +0000 |
| commit | d817b819998ec251b6d5bc3f4cd89e41a916e436 (patch) | |
| tree | 40ce570537ed8dcdba57cc937d5ae155e3f7f3fa /src | |
| parent | 1345f4257b28cb248022abd94ea9be13a90b1991 (diff) | |
| download | krb5-d817b819998ec251b6d5bc3f4cd89e41a916e436.tar.gz krb5-d817b819998ec251b6d5bc3f4cd89e41a916e436.tar.xz krb5-d817b819998ec251b6d5bc3f4cd89e41a916e436.zip | |
* Make shared libs work on AIX
* Do not use #ifdef unix
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9954 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/et/ChangeLog | 12 | ||||
| -rw-r--r-- | src/util/et/Makefile.in | 2 | ||||
| -rw-r--r-- | src/util/et/com_err.c | 2 | ||||
| -rw-r--r-- | src/util/et/com_err.h | 2 | ||||
| -rw-r--r-- | src/util/et/error_message.c | 2 | ||||
| -rw-r--r-- | src/util/et/et_h.awk | 3 |
6 files changed, 18 insertions, 5 deletions
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index b3fbf189b..1bcd74b0d 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -1,3 +1,15 @@ +Sat Feb 22 02:22:01 1997 Sam Hartman <hartmans@mit.edu> + + * error_message.c: Remove #ifdef unix + +Sat Feb 22 02:18:47 1997 Sam Hartman <hartmans@tertius.mit.edu> + + * et_h.awk (char_shift): Avoid #ifdef unix + +Sat Feb 22 02:04:20 1997 Sam Hartman <hartmans@mit.edu> + + * com_err.c: Remove #ifdef unix + Sat Feb 22 00:34:05 1997 Sam Hartman <hartmans@luminous.MIT.EDU> * Makefile.in (LIBMAJOR): Bump to 3 so that the krb5 lib is preferred to the NetBSD system library. diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in index 4c1dd460d..d04796816 100644 --- a/src/util/et/Makefile.in +++ b/src/util/et/Makefile.in @@ -53,7 +53,7 @@ DEPLIBS= SHLIB_LIBS= SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ -STEXT=@STEXT@ + all-windows:: $(OBJFILE) copy com_err.h $(BUILDTOP)\include diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c index a8f92fbc0..af86d4924 100644 --- a/src/util/et/com_err.c +++ b/src/util/et/com_err.c @@ -128,7 +128,7 @@ KRB5_DLLIMP void KRB5_CALLCONV_C com_err(whoami, code, fmt, va_alist) va_end(ap); } -#ifdef unix +#if !(defined(_MSDOS)||defined(_WIN32)) et_old_error_hook_func set_com_err_hook (new_proc) et_old_error_hook_func new_proc; { diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h index 6258ad027..aebe1bb68 100644 --- a/src/util/et/com_err.h +++ b/src/util/et/com_err.h @@ -76,7 +76,7 @@ KRB5_DLLIMP extern errcode_t KRB5_CALLCONV add_error_table KRB5_DLLIMP extern errcode_t KRB5_CALLCONV remove_error_table ET_P((const struct error_table FAR *)); -#ifdef unix +#if !(defined(_MSDOS)||defined(_WIN32)) /* * The display routine should be application specific. A global hook, * may cause inappropriate display procedures to be called between diff --git a/src/util/et/error_message.c b/src/util/et/error_message.c index 78bca4208..c20e1d0a9 100644 --- a/src/util/et/error_message.c +++ b/src/util/et/error_message.c @@ -39,7 +39,7 @@ extern const int sys_nerr; static char buffer[ET_EBUFSIZ]; -#ifndef unix +#if defined(_MSDOS)||defined(_WIN32) static struct et_list * _et_list = (struct et_list *) NULL; #else /* Old interface compatibility */ diff --git a/src/util/et/et_h.awk b/src/util/et/et_h.awk index 4a635f5c6..3f0639db9 100644 --- a/src/util/et/et_h.awk +++ b/src/util/et/et_h.awk @@ -148,7 +148,7 @@ END { print "" > outfile print "extern struct error_table et_" table_name "_error_table;" > outfile print "" > outfile - print "#ifdef unix" > outfile + print "#if !(defined(_MSDOS)||defined(_WIN32))" > outfile print "/* for compatibility with older versions... */" > outfile print "extern void initialize_" table_name "_error_table ();" > outfile print "#define init_" table_name "_err_tbl initialize_" table_name "_error_table" > outfile @@ -157,3 +157,4 @@ END { print "#define initialize_" table_name "_error_table()" > outfile print "#endif" > outfile } + |