* 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

diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog
index b3fbf189b29e402f1d7b7fa8f4d3075591801d1f..1bcd74b0d92736c90f4ca6b74aa04f4547579e10 100644 (file)
--- 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 4c1dd460dd40cc3302225e62d56955dd968565a6..d04796816104c60e0514597c798a010f39774024 100644 (file)
--- 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 a8f92fbc0ecb45496fd86a66e7a9cf724e46572f..af86d4924a3081736838fe51062d8ccd4ef2eba2 100644 (file)
--- 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 6258ad0272fba52515bab3d5b473733049fa507b..aebe1bb68bc03a83645894f0d2b0e76ce54628b0 100644 (file)
--- 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 78bca4208d242334d55566e16c5e04146590b29e..c20e1d0a9f8c379fe555132a4983591729b3b6c7 100644 (file)
--- 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 4a635f5c6d77420bfe6db03203be99caf9ac6ccf..3f0639db9287d60df2cab022dc796bd7b26c4272 100644 (file)
--- 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
 }
+