Module Name: src
Committed By: kamil
Date: Thu Jun 22 13:37:16 UTC 2017
Modified Files:
src/bin/ksh: config.h sh.h trap.c
Log Message:
Remove code for AIX, including hack for 3.2.5 (from 1997) - from ksh(1)
OK by <kre>
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/bin/ksh/config.h
cvs rdiff -u -r1.9 -r1.10 src/bin/ksh/sh.h
cvs rdiff -u -r1.8 -r1.9 src/bin/ksh/trap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/config.h
diff -u src/bin/ksh/config.h:1.11 src/bin/ksh/config.h:1.12
--- src/bin/ksh/config.h:1.11 Thu Jun 22 13:35:47 2017
+++ src/bin/ksh/config.h Thu Jun 22 13:37:16 2017
@@ -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 */
Index: src/bin/ksh/sh.h
diff -u src/bin/ksh/sh.h:1.9 src/bin/ksh/sh.h:1.10
--- src/bin/ksh/sh.h:1.9 Thu Jun 22 13:33:39 2017
+++ src/bin/ksh/sh.h Thu Jun 22 13:37:16 2017
@@ -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 @@ typedef struct trap {
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
/*
Index: src/bin/ksh/trap.c
diff -u src/bin/ksh/trap.c:1.8 src/bin/ksh/trap.c:1.9
--- src/bin/ksh/trap.c:1.8 Mon Oct 16 00:07:32 2006
+++ src/bin/ksh/trap.c Thu Jun 22 13:37:16 2017
@@ -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
