From 98553e52a14b97a03aef8dc4fc0300b3f4c2c4b5 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu, 20 May 2010 17:56:27 -0700
Subject: [PATCH] vbe.h: Use __attribute__((packed)) on Sun cc 5.9 & later as
 well as gcc

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 hw/xfree86/vbe/vbe.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h
index 3ebd440a8..072621fa6 100644
--- a/hw/xfree86/vbe/vbe.h
+++ b/hw/xfree86/vbe/vbe.h
@@ -65,7 +65,7 @@ typedef struct vbeControllerInfoBlock {
 #pragma pack(0)
 #endif
 
-#ifndef __GNUC__
+#if !( defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) )
 #define __attribute__(a)
 #endif