Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/ksh Remove code for AIX, including hack for 3.2.5 (from ...



details:   https://anonhg.NetBSD.org/src/rev/41721d1bf4c0
branches:  trunk
changeset: 824894:41721d1bf4c0
user:      kamil <kamil%NetBSD.org@localhost>
date:      Thu Jun 22 13:37:16 2017 +0000

description:
Remove code for AIX, including hack for 3.2.5 (from 1997) - from ksh(1)

OK by <kre>

diffstat:

 bin/ksh/config.h |  9 +--------
 bin/ksh/sh.h     |  7 ++-----
 bin/ksh/trap.c   |  7 ++-----
 3 files changed, 5 insertions(+), 18 deletions(-)

diffs (73 lines):

diff -r 1bf6fe13331d -r 41721d1bf4c0 bin/ksh/config.h
--- a/bin/ksh/config.h  Thu Jun 22 13:35:47 2017 +0000
+++ b/bin/ksh/config.h  Thu Jun 22 13:37:16 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: config.h,v 1.11 2017/06/22 13:35:47 kamil Exp $        */
+/*     $NetBSD: config.h,v 1.12 2017/06/22 13:37:16 kamil Exp $        */
 
 /* config.h.  Generated automatically by configure.  */
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
@@ -11,13 +11,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-/* Define if on AIX 3.
-   System headers sometimes define this.
-   We just want to avoid a redefinition error message.  */
-#ifndef _ALL_SOURCE
-/* #undef _ALL_SOURCE */
-#endif
-
 /* Define if the closedir function returns void instead of int.  */
 /* #undef CLOSEDIR_VOID */
 
diff -r 1bf6fe13331d -r 41721d1bf4c0 bin/ksh/sh.h
--- a/bin/ksh/sh.h      Thu Jun 22 13:35:47 2017 +0000
+++ b/bin/ksh/sh.h      Thu Jun 22 13:37:16 2017 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: sh.h,v 1.9 2017/06/22 13:33:39 kamil Exp $     */
+/*     $NetBSD: sh.h,v 1.10 2017/06/22 13:37:16 kamil Exp $    */
 
 /*
  * Public Domain Bourne/Korn shell
  */
 
-/* $Id: sh.h,v 1.9 2017/06/22 13:33:39 kamil Exp $ */
+/* $Id: sh.h,v 1.10 2017/06/22 13:37:16 kamil Exp $ */
 
 #include "config.h"    /* system and option configuration info */
 
@@ -545,10 +545,7 @@
 EXTERN int volatile trap;      /* traps pending? */
 EXTERN int volatile intrsig;   /* pending trap interrupts executing command */
 EXTERN int volatile fatal_trap;/* received a fatal signal */
-#ifndef FROM_TRAP_C
-/* Kludge to avoid bogus re-declaration of sigtraps[] error on AIX 3.2.5 */
 extern Trap    sigtraps[SIGNALS+1];
-#endif /* !FROM_TRAP_C */
 
 #ifdef KSH
 /*
diff -r 1bf6fe13331d -r 41721d1bf4c0 bin/ksh/trap.c
--- a/bin/ksh/trap.c    Thu Jun 22 13:35:47 2017 +0000
+++ b/bin/ksh/trap.c    Thu Jun 22 13:37:16 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.8 2006/10/16 00:07:32 christos Exp $        */
+/*     $NetBSD: trap.c,v 1.9 2017/06/22 13:37:16 kamil Exp $   */
 
 /*
  * signal handling
@@ -6,12 +6,9 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: trap.c,v 1.8 2006/10/16 00:07:32 christos Exp $");
+__RCSID("$NetBSD: trap.c,v 1.9 2017/06/22 13:37:16 kamil Exp $");
 #endif
 
-
-/* Kludge to avoid bogus re-declaration of sigtraps[] error on AIX 3.2.5 */
-#define FROM_TRAP_C
 #include "sh.h"
 
 /* Table is indexed by signal number



Home | Main Index | Thread Index | Old Index