fixup! cpu: Fix array-bounds errors with GCC 6

RIOT-OS · Jul 12, 2016 · 7193a1c · 7193a1c
1 parent c68a0b3
commit 7193a1c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/cpu/nrf51/periph/adc.c b/cpu/nrf51/periph/adc.c
@@ -87,4 +87,7 @@ int adc_sample(adc_t line, adc_res_t res)
 
     return val;
 }
+
+#else
+typedef int dont_be_pedantic;
 #endif /* ADC_CONFIG */
diff --git a/cpu/stm32_common/periph/dac.c b/cpu/stm32_common/periph/dac.c
@@ -25,8 +25,7 @@
 #include "periph_conf.h"
 
 /* only compile this, if the CPU has a DAC */
-#if defined(DAC) || defined(DAC1)
-#ifdef DAC_CONFIG
+#if (defined(DAC) || defined(DAC1)) && defined(DAC_CONFIG)
 
 #ifdef DAC2
 #define _DAC(line)          (dac_config[line].dac ? DAC2 : DAC1)
@@ -91,5 +90,6 @@ void dac_poweroff(dac_t line)
     DAC->CR &= ~(1 << (16 * dac_config[line].chan));
 }
 
-#endif /* DAC_CONFIG */
+#else
+typedef int dont_be_pedantic;
 #endif /* DAC */
diff --git a/cpu/stm32f0/periph/adc.c b/cpu/stm32f0/periph/adc.c
@@ -103,4 +103,6 @@ int adc_sample(adc_t line,  adc_res_t res)
     return sample;
 }
 
+#else
+typedef int dont_be_pedantic;
 #endif /* ADC_CONFIG */
diff --git a/cpu/stm32f1/periph/adc.c b/cpu/stm32f1/periph/adc.c
@@ -157,4 +157,6 @@ int adc_sample(adc_t line, adc_res_t res)
     return sample;
 }
 
+#else
+typedef int dont_be_pedantic;
 #endif /* ADC_CONFIG */
diff --git a/cpu/stm32f4/periph/adc.c b/cpu/stm32f4/periph/adc.c
@@ -122,4 +122,6 @@ int adc_sample(adc_t line, adc_res_t res)
     return sample;
 }
 
+#else
+typedef int dont_be_pedantic;
 #endif /* ADC_CONFIG */