fixup mergo from cid 10054762AC33B0CB0D0

This commit is contained in:
tg 2015-01-22 16:54:29 +00:00
parent 59fcff27ae
commit d5bdd0e364
1 changed files with 2 additions and 2 deletions

View File

@ -1,5 +1,5 @@
/* $OpenBSD: history.c,v 1.39 2010/05/19 17:36:08 jasper Exp $ */
/* $OpenBSD: history.c,v 1.40 2014/11/20 15:22:39 tedu Exp $ */
/* $OpenBSD: trap.c,v 1.23 2010/05/19 17:36:08 jasper Exp $ */
/*-
* Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
@ -27,7 +27,7 @@
#include <sys/file.h>
#endif
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.137 2014/11/26 19:32:12 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.138 2015/01/22 16:54:29 tg Exp $");
Trap sigtraps[NSIG + 1];
static struct sigaction Sigact_ign;