From owner-svn-src-head@FreeBSD.ORG  Wed Jul 23 18:05:40 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 01D18B40;
 Wed, 23 Jul 2014 18:05:40 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E31922997;
 Wed, 23 Jul 2014 18:05:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6NI5dva093236;
 Wed, 23 Jul 2014 18:05:39 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6NI5dne093235;
 Wed, 23 Jul 2014 18:05:39 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201407231805.s6NI5dne093235@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 23 Jul 2014 18:05:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269021 - head/usr.bin/mkimg
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Wed, 23 Jul 2014 18:05:40 -0000

Author: marcel
Date: Wed Jul 23 18:05:39 2014
New Revision: 269021
URL: http://svnweb.freebsd.org/changeset/base/269021

Log:
  Fix builds on older FreeBSD versions and/or non-FreeBSD machines:
  don't use _Static_assert unconditionally.

Modified:
  head/usr.bin/mkimg/vhd.c

Modified: head/usr.bin/mkimg/vhd.c
==============================================================================
--- head/usr.bin/mkimg/vhd.c	Wed Jul 23 18:04:52 2014	(r269020)
+++ head/usr.bin/mkimg/vhd.c	Wed Jul 23 18:05:39 2014	(r269021)
@@ -40,6 +40,10 @@ __FBSDID("$FreeBSD$");
 #include "format.h"
 #include "mkimg.h"
 
+#ifndef __has_extension
+#define	__has_extension(x)	0
+#endif
+
 /*
  * General notes:
  * o   File is in network byte order.
@@ -88,8 +92,10 @@ struct vhd_footer {
 	uint8_t		saved_state;
 	uint8_t		_reserved[427];
 };
+#if __has_extension(c_static_assert)
 _Static_assert(sizeof(struct vhd_footer) == VHD_SECTOR_SIZE,
     "Wrong size for footer");
+#endif
 
 static uint32_t
 vhd_checksum(void *buf, size_t sz)
@@ -250,8 +256,10 @@ struct vhd_dyn_header {
 	} parent_locator[8];
 	char		_reserved2[256];
 };
+#if __has_extension(c_static_assert)
 _Static_assert(sizeof(struct vhd_dyn_header) == VHD_SECTOR_SIZE * 2,
     "Wrong size for header");
+#endif
 
 static int
 vhd_dyn_write(int fd)