From owner-svn-src-head@FreeBSD.ORG  Mon Jun  1 11:02:10 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 93A46106564A;
	Mon,  1 Jun 2009 11:02:10 +0000 (UTC) (envelope-from rse@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F8E08FC1B;
	Mon,  1 Jun 2009 11:02:10 +0000 (UTC) (envelope-from rse@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 n51B2AIW076965;
	Mon, 1 Jun 2009 11:02:10 GMT (envelope-from rse@svn.freebsd.org)
Received: (from rse@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51B2AFv076962;
	Mon, 1 Jun 2009 11:02:10 GMT (envelope-from rse@svn.freebsd.org)
Message-Id: <200906011102.n51B2AFv076962@svn.freebsd.org>
From: "Ralf S. Engelschall" <rse@FreeBSD.org>
Date: Mon, 1 Jun 2009 11:02:10 +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: r193222 - head/bin/sh
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Jun 2009 11:02:11 -0000

Author: rse
Date: Mon Jun  1 11:02:09 2009
New Revision: 193222
URL: http://svn.freebsd.org/changeset/base/193222

Log:
  correctly test for __GNUC__ macro (non-GCC compilers do not have it defined at all)

Modified:
  head/bin/sh/eval.c
  head/bin/sh/parser.c
  head/bin/sh/var.c

Modified: head/bin/sh/eval.c
==============================================================================
--- head/bin/sh/eval.c	Mon Jun  1 10:50:17 2009	(r193221)
+++ head/bin/sh/eval.c	Mon Jun  1 11:02:09 2009	(r193222)
@@ -594,7 +594,7 @@ evalcommand(union node *cmd, int flags, 
 	char *lastarg;
 	int realstatus;
 	int do_clearcmdentry;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &argv;
 	(void) &argc;

Modified: head/bin/sh/parser.c
==============================================================================
--- head/bin/sh/parser.c	Mon Jun  1 10:50:17 2009	(r193221)
+++ head/bin/sh/parser.c	Mon Jun  1 11:02:09 2009	(r193222)
@@ -898,7 +898,7 @@ readtoken1(int firstc, char const *synta
 	int oldstyle;
 	char const *prevsyntax;	/* syntax before arithmetic */
 	int synentry;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &out;
 	(void) &quotef;
@@ -1323,7 +1323,7 @@ parsebackq: {
 	struct jmploc *volatile savehandler;
 	int savelen;
 	int saveprompt;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &saveprompt;
 #endif

Modified: head/bin/sh/var.c
==============================================================================
--- head/bin/sh/var.c	Mon Jun  1 10:50:17 2009	(r193221)
+++ head/bin/sh/var.c	Mon Jun  1 11:02:09 2009	(r193222)
@@ -195,7 +195,7 @@ setvarsafe(char *name, char *val, int fl
 	struct jmploc jmploc;
 	struct jmploc *volatile savehandler = handler;
 	int err = 0;
-#if __GNUC__
+#ifdef __GNUC__
 	/* Avoid longjmp clobbering */
 	(void) &err;
 #endif