From owner-svn-src-all@FreeBSD.ORG  Sun Jun 14 21:39:53 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C92E106566C;
	Sun, 14 Jun 2009 21:39:53 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4A9D48FC14;
	Sun, 14 Jun 2009 21:39:53 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5ELdrGV061833;
	Sun, 14 Jun 2009 21:39:53 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5ELdr3N061830;
	Sun, 14 Jun 2009 21:39:53 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <200906142139.n5ELdr3N061830@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Sun, 14 Jun 2009 21:39:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194217 - in head: usr.bin/make usr.sbin/mount_portalfs
	usr.sbin/ngctl
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Jun 2009 21:39:54 -0000

Author: des
Date: Sun Jun 14 21:39:52 2009
New Revision: 194217
URL: http://svn.freebsd.org/changeset/base/194217

Log:
  Add volatile to sig_atomic_t where it was missing.
  
  MFC after:	1 week

Modified:
  head/usr.bin/make/job.c
  head/usr.sbin/mount_portalfs/mount_portalfs.c
  head/usr.sbin/ngctl/main.c

Modified: head/usr.bin/make/job.c
==============================================================================
--- head/usr.bin/make/job.c	Sun Jun 14 21:16:23 2009	(r194216)
+++ head/usr.bin/make/job.c	Sun Jun 14 21:39:52 2009	(r194217)
@@ -342,7 +342,7 @@ static int	fifoFd;		/* Fd of our job fif
 static char	fifoName[] = "/tmp/make_fifo_XXXXXXXXX";
 static int	fifoMaster;
 
-static sig_atomic_t interrupted;
+static volatile sig_atomic_t interrupted;
 
 
 #if defined(USE_PGRP) && defined(SYSV)

Modified: head/usr.sbin/mount_portalfs/mount_portalfs.c
==============================================================================
--- head/usr.sbin/mount_portalfs/mount_portalfs.c	Sun Jun 14 21:16:23 2009	(r194216)
+++ head/usr.sbin/mount_portalfs/mount_portalfs.c	Sun Jun 14 21:39:52 2009	(r194217)
@@ -70,7 +70,7 @@ struct mntopt mopts[] = {
 
 static void usage(void) __dead2;
 
-static sig_atomic_t readcf;	/* Set when SIGHUP received */
+static volatile sig_atomic_t readcf;	/* Set when SIGHUP received */
 
 static void sighup(int sig __unused)
 {

Modified: head/usr.sbin/ngctl/main.c
==============================================================================
--- head/usr.sbin/ngctl/main.c	Sun Jun 14 21:16:23 2009	(r194216)
+++ head/usr.sbin/ngctl/main.c	Sun Jun 14 21:39:52 2009	(r194217)
@@ -79,7 +79,7 @@ static int	ReadCmd(int ac, char **av);
 static int	HelpCmd(int ac, char **av);
 static int	QuitCmd(int ac, char **av);
 #ifdef EDITLINE
-static sig_atomic_t	unblock;
+static volatile sig_atomic_t unblock;
 static pthread_mutex_t	mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t	cond = PTHREAD_COND_INITIALIZER;
 #endif