From 8bb11171da32f893eaee39ae54fad7166fd7efdb Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sun, 16 Feb 2014 11:24:44 +0000
Subject: [PATCH] stm: Only define __packed if not already defined.

Addresses issue #299.
---
 stm/stmusb/usb_conf.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stm/stmusb/usb_conf.h b/stm/stmusb/usb_conf.h
index 5856899d59..1ae7135180 100644
--- a/stm/stmusb/usb_conf.h
+++ b/stm/stmusb/usb_conf.h
@@ -293,7 +293,9 @@
 #elif defined (__ICCARM__)     /* IAR Compiler */
   #define __packed    __packed
 #elif defined   ( __GNUC__ )   /* GNU Compiler */                        
-  #define __packed    __attribute__ ((__packed__))
+  #ifndef __packed              /* dpgeorge: add check for already defined symbol, since some compilers define it in cdefs.h */
+    #define __packed    __attribute__ ((__packed__))
+  #endif
 #elif defined   (__TASKING__)  /* TASKING Compiler */
   #define __packed    __unaligned
 #endif /* __CC_ARM */