From owner-svn-src-user@FreeBSD.ORG  Wed Oct  1 16:48:55 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 94E2E102;
 Wed,  1 Oct 2014 16:48:55 +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 820312E1;
 Wed,  1 Oct 2014 16:48:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s91GmtGa085372;
 Wed, 1 Oct 2014 16:48:55 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s91Gmtsj085371;
 Wed, 1 Oct 2014 16:48:55 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201410011648.s91Gmtsj085371@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 1 Oct 2014 16:48:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r272375 - user/marcel/mkimg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Oct 2014 16:48:55 -0000

Author: marcel
Date: Wed Oct  1 16:48:54 2014
New Revision: 272375
URL: https://svnweb.freebsd.org/changeset/base/272375

Log:
  Make sure the cookies are constants of appropriate width.

Modified:
  user/marcel/mkimg/vhd.c

Modified: user/marcel/mkimg/vhd.c
==============================================================================
--- user/marcel/mkimg/vhd.c	Wed Oct  1 16:47:14 2014	(r272374)
+++ user/marcel/mkimg/vhd.c	Wed Oct  1 16:48:54 2014	(r272375)
@@ -64,7 +64,7 @@ __FBSDID("$FreeBSD$");
 
 struct vhd_footer {
 	uint64_t	cookie;
-#define	VHD_FOOTER_COOKIE	0x636f6e6563746978
+#define	VHD_FOOTER_COOKIE	0x636f6e6563746978ULL
 	uint32_t	features;
 #define	VHD_FEATURES_TEMPORARY	0x01
 #define	VHD_FEATURES_RESERVED	0x02
@@ -236,7 +236,7 @@ vhd_resize(lba_t imgsz)
 
 struct vhd_dyn_header {
 	uint64_t	cookie;
-#define	VHD_HEADER_COOKIE	0x6378737061727365
+#define	VHD_HEADER_COOKIE	0x6378737061727365ULL
 	uint64_t	data_offset;
 	uint64_t	table_offset;
 	uint32_t	version;