Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 156b9f3d authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 538e5778: merge from open-source master

Merge commit '538e5778' into kraken

* commit '538e5778':
  sys_signame[] was added to libc, remove conflicting definition
parents a523b5b2 538e5778
Loading
Loading
Loading
Loading
+0 −14
Original line number Diff line number Diff line
@@ -60,20 +60,6 @@ __RCSID("$NetBSD: trap.c,v 1.31 2005/01/11 19:38:57 christos Exp $");
#include "mystring.h"
#include "var.h"

static const char *sys_signame[NSIG] = {
	"Unused",
	"HUP",      "INT",    "QUIT",    "ILL",
	"TRAP",     "ABRT",   "BUS",     "FPE",
	"KILL",     "USR1",   "SEGV",    "USR2",
	"PIPE",     "ALRM",   "TERM",
	"Unknown",
	"CHLD",
	"CONT",     "STOP",   "TSTP",    "TTIN",
	"TTOU",     "URG",    "XCPU",    "XFSZ",
	"VTALRM",   "PROF",   "WINCH",   "IO",
	"PWR",      "SYS"
};

/*
 * Sigmode records the current value of the signal handlers for the various
 * modes.  A value of zero means that the current handler is not known.