From 14d41371e239d390aebd65582aa0ab4fed4934cd Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Sat, 6 Mar 2010 13:31:03 +0000
Subject: blktap: provide a variant of __RING_SIZE() that is an integer
 constant expression

Without this new variant, gcc 4.5 won't compile where this is being
used to specify array sizes.  See also c/s 20975.

Signed-off-by: Charles Arnold <carnold@novell.com>
---
 tools/blktap/lib/blktaplib.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/blktap')

diff --git a/tools/blktap/lib/blktaplib.h b/tools/blktap/lib/blktaplib.h
index d54ae3e57b..47dcdff05b 100644
--- a/tools/blktap/lib/blktaplib.h
+++ b/tools/blktap/lib/blktaplib.h
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#define BLK_RING_SIZE __RING_SIZE((blkif_sring_t *)0, XC_PAGE_SIZE)
+#define BLK_RING_SIZE __CONST_RING_SIZE(blkif, XC_PAGE_SIZE)
 
 /* size of the extra VMA area to map in attached pages. */
 #define BLKTAP_VMA_PAGES BLK_RING_SIZE
-- 
cgit v1.2.3