From owner-p4-projects@FreeBSD.ORG  Sat Apr 15 22:49:00 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 014D316A405; Sat, 15 Apr 2006 22:49:00 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D432F16A400
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 22:48:59 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9E0DA43D6D
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 22:48:59 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3FMmxut033668
	for <perforce@freebsd.org>; Sat, 15 Apr 2006 22:48:59 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3FMmxKB033665
	for perforce@freebsd.org; Sat, 15 Apr 2006 22:48:59 GMT
	(envelope-from jb@freebsd.org)
Date: Sat, 15 Apr 2006 22:48:59 GMT
Message-Id: <200604152248.k3FMmxKB033665@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95361 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Apr 2006 22:49:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=95361

Change 95361 by jb@jb_freebsd2 on 2006/04/15 22:48:06

	SysV -> BSD signal handling. Only include Solaris headers on Solaris.

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#2 edit

Differences ...

==== //depot/projects/dtrace/src/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#2 (text) ====

@@ -152,9 +152,11 @@
 	int keep_stabs = 0;
 	int c;
 
+#if defined(sun)
 	sighold(SIGINT);
 	sighold(SIGQUIT);
 	sighold(SIGTERM);
+#endif
 
 	progname = basename(argv[0]);
 
@@ -216,9 +218,15 @@
 	 */
 	set_terminate_cleanup(terminate_cleanup);
 
+#if defined(sun)
 	sigset(SIGINT, handle_sig);
 	sigset(SIGQUIT, handle_sig);
 	sigset(SIGTERM, handle_sig);
+#else
+	signal(SIGINT, handle_sig);
+	signal(SIGQUIT, handle_sig);
+	signal(SIGTERM, handle_sig);
+#endif
 
 	filetd = tdata_new();