From: Gregor Riepl <onitake@gmail.com>
Date: Tue, 16 Dec 2014 15:18:36 +0000 (+0100)
Subject: i2c: avoif using a poisoned macro
X-Git-Url: http://git.droids-corp.org/?p=aversive.git;a=commitdiff_plain;h=762c639369a6d84aedb6599f17e53157df8c6daa

i2c: avoif using a poisoned macro

Change the i2c interrupt name evaluation order to avoid hitting a
poisened macro.

Signed-off-by: Gregor Riepl <onitake@gmail.com>
---

diff --git a/modules/comm/i2c/i2c.c b/modules/comm/i2c/i2c.c
index 81dae5c..546cc3c 100644
--- a/modules/comm/i2c/i2c.c
+++ b/modules/comm/i2c/i2c.c
@@ -538,9 +538,11 @@ void i2c_debug(void)
  * Interrupt routing for I2C. Refer to datasheets for more
  * informations.
  */
-#if !defined(TWI_vect) && defined(SIG_2WIRE_SERIAL)
+#ifndef TWI_vect
+#if defined(SIG_2WIRE_SERIAL)
 #define TWI_vect SIG_2WIRE_SERIAL
 #endif
+#endif
 SIGNAL(TWI_vect)
 {
 	uint8_t hard_status;