i2c: avoif using a poisoned macro
authorGregor Riepl <onitake@gmail.com>
Tue, 16 Dec 2014 15:18:36 +0000 (16:18 +0100)
committerOlivier Matz <zer0@droids-corp.org>
Sun, 8 Feb 2015 21:36:03 +0000 (22:36 +0100)
Change the i2c interrupt name evaluation order to avoid hitting a
poisened macro.

Signed-off-by: Gregor Riepl <onitake@gmail.com>
modules/comm/i2c/i2c.c

index 81dae5c..546cc3c 100644 (file)
@@ -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;