From 7dc63bab93d257cd33f55ee8cb7dfbe8ed571908 Mon Sep 17 00:00:00 2001 From: Ross Owen Date: Wed, 30 Apr 2014 12:49:38 +0100 Subject: [PATCH] Fixed up build warnings relating to multiple define definitions. --- module_usb_audio/devicedefines.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h index 7929aa86..b994000c 100644 --- a/module_usb_audio/devicedefines.h +++ b/module_usb_audio/devicedefines.h @@ -245,13 +245,12 @@ * * Default: NONE (Must be defined by app when SPDIF_RX enabled) */ -#ifdef SPDIF_RX +#if defined (SPDIF_RX) || defined (__DOXYGEN__) #ifndef SPDIF_RX_INDEX #error SPDIF_RX_INDEX not defined and SPDIF_RX defined -#endif -#else #define SPDIF_RX_INDEX 0 /* Default define for doxygen */ #endif +#endif /** * @brief ADAT Rx first channel index. defines which channels ADAT will be input on. @@ -259,12 +258,11 @@ * * Default: NONE (Must be defined by app when ADAT_RX enabled) */ -#ifdef ADAT_RX +#if defined(ADAT_RX) || defined(__DOXYGEN__) #ifndef ADAT_RX_INDEX #error ADAT_RX_INDEX not defined and ADAT_RX defined + #define ADAT_RX_INDEX (0) /* Default define for doxygen */ #endif -#else - #define ADAT_RX_INDEX 0 /* Default define for doxygen */ #endif /**