Skip to content

Commit 8bb1117

Browse files
dpgeorgedpgeorge
committed
stm: Only define __packed if not already defined.
Addresses issue adafruit#299.
1 parent 5fd7bc3 commit 8bb1117

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

‎stm/stmusb/usb_conf.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,9 @@
293293
#elif defined (__ICCARM__) /* IAR Compiler */
294294
#define __packed __packed
295295
#elif defined ( __GNUC__ ) /* GNU Compiler */
296-
#define __packed __attribute__ ((__packed__))
296+
#ifndef __packed /* dpgeorge: add check for already defined symbol, since some compilers define it in cdefs.h */
297+
#define __packed __attribute__ ((__packed__))
298+
#endif
297299
#elif defined (__TASKING__) /* TASKING Compiler */
298300
#define __packed __unaligned
299301
#endif /* __CC_ARM */

0 commit comments

Comments
 (0)