summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/sigact.h6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a530da4d..15eabc51b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -46,6 +46,8 @@
46 Id and copyright sync only, there were no substantial changes we need. 46 Id and copyright sync only, there were no substantial changes we need.
47 - (dtucker) [openbsd-compat/bsd-closefrom.c openbsd-compat/base64.c] 47 - (dtucker) [openbsd-compat/bsd-closefrom.c openbsd-compat/base64.c]
48 -Wsign-compare fixes from djm. 48 -Wsign-compare fixes from djm.
49 - (dtucker) [openbsd-compat/sigact.h] Update from OpenBSD 1.2 -> 1.3.
50 Id and copyright sync only, there were no substantial changes we need.
49 51
5020051105 5220051105
51 - (djm) OpenBSD CVS Sync 53 - (djm) OpenBSD CVS Sync
@@ -3288,4 +3290,4 @@
3288 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3290 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3289 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3291 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3290 3292
3291$Id: ChangeLog,v 1.3987 2005/11/10 08:31:37 dtucker Exp $ 3293$Id: ChangeLog,v 1.3988 2005/11/10 08:43:48 dtucker Exp $
diff --git a/openbsd-compat/sigact.h b/openbsd-compat/sigact.h
index 7821e09e8..db96d0a5c 100644
--- a/openbsd-compat/sigact.h
+++ b/openbsd-compat/sigact.h
@@ -1,7 +1,7 @@
1/* $OpenBSD: SigAction.h,v 1.2 1999/06/27 08:15:19 millert Exp $ */ 1/* $OpenBSD: SigAction.h,v 1.3 2001/01/22 18:01:32 millert Exp $ */
2 2
3/**************************************************************************** 3/****************************************************************************
4 * Copyright (c) 1998 Free Software Foundation, Inc. * 4 * Copyright (c) 1998,2000 Free Software Foundation, Inc. *
5 * * 5 * *
6 * Permission is hereby granted, free of charge, to any person obtaining a * 6 * Permission is hereby granted, free of charge, to any person obtaining a *
7 * copy of this software and associated documentation files (the * 7 * copy of this software and associated documentation files (the *
@@ -34,7 +34,7 @@
34 ****************************************************************************/ 34 ****************************************************************************/
35 35
36/* 36/*
37 * $From: SigAction.h,v 1.5 1999/06/19 23:00:54 tom Exp $ 37 * $From: SigAction.h,v 1.6 2000/12/10 02:36:10 tom Exp $
38 * 38 *
39 * This file exists to handle non-POSIX systems which don't have <unistd.h>, 39 * This file exists to handle non-POSIX systems which don't have <unistd.h>,
40 * and usually no sigaction() nor <termios.h> 40 * and usually no sigaction() nor <termios.h>