From owner-svn-src-stable-7@FreeBSD.ORG  Sat Nov 20 13:30:48 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 796A9106564A;
	Sat, 20 Nov 2010 13:30:48 +0000 (UTC)
	(envelope-from bschmidt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 67B988FC16;
	Sat, 20 Nov 2010 13:30:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAKDUm5T013593;
	Sat, 20 Nov 2010 13:30:48 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Received: (from bschmidt@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAKDUmHX013591;
	Sat, 20 Nov 2010 13:30:48 GMT
	(envelope-from bschmidt@svn.freebsd.org)
Message-Id: <201011201330.oAKDUmHX013591@svn.freebsd.org>
From: Bernhard Schmidt <bschmidt@FreeBSD.org>
Date: Sat, 20 Nov 2010 13:30:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215566 - stable/7/sys/net80211
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Nov 2010 13:30:48 -0000

Author: bschmidt
Date: Sat Nov 20 13:30:48 2010
New Revision: 215566
URL: http://svn.freebsd.org/changeset/base/215566

Log:
  MFC r201793:
  Fix #ifdefs so that GCC 4.4 doesn't complain about it.
  
  Committed by:	trasz

Modified:
  stable/7/sys/net80211/ieee80211_var.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/net80211/ieee80211_var.h
==============================================================================
--- stable/7/sys/net80211/ieee80211_var.h	Sat Nov 20 13:28:32 2010	(r215565)
+++ stable/7/sys/net80211/ieee80211_var.h	Sat Nov 20 13:30:48 2010	(r215566)
@@ -35,11 +35,11 @@
 #undef	IEEE80211_DEBUG_REFCNT			/* node refcnt stuff */
 
 /* NB: portability glue must go first */
-#ifdef __NetBSD__
+#if defined(__NetBSD__)
 #include <net80211/ieee80211_netbsd.h>
-#elif __FreeBSD__
+#elif defined(__FreeBSD__)
 #include <net80211/ieee80211_freebsd.h>
-#elif __linux__
+#elif defined(__linux__)
 #include <net80211/ieee80211_linux.h>
 #else
 #error	"No support for your operating system!"