From 4e4496f70d00fe24b2c5d594d6500f537eeb6478 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Wed, 17 Oct 2012 11:45:52 +0200 Subject: [fix] GCC < 4.5 that does not accept any argument for the deprecated attribute. --- include/libopencm3/stm32/f1/adc.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/libopencm3/stm32/f1/adc.h b/include/libopencm3/stm32/f1/adc.h index aa54bdf..95c3732 100644 --- a/include/libopencm3/stm32/f1/adc.h +++ b/include/libopencm3/stm32/f1/adc.h @@ -708,8 +708,12 @@ void adc_calibration(u32 adc); void adc_set_continuous_conversion_mode(u32 adc); void adc_set_single_conversion_mode(u32 adc); #ifdef __GNUC__ +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR_ > 4) void adc_on(u32 adc) __attribute__ ((deprecated ("will be removed in the first release"))); #else +void adc_on(u32 adc) __attribute__ ((deprecated)); +#endif +#else void adc_on(u32 adc); #endif void adc_off(u32 adc); @@ -721,11 +725,19 @@ void adc_set_regular_sequence(u32 adc, u8 length, u8 channel[]); void adc_set_injected_sequence(u32 adc, u8 length, u8 channel[]); #ifdef __GNUC__ +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR_ > 4) void adc_set_continous_conversion_mode(u32 adc) __attribute__ ((deprecated ("change to adc_set_continuous_conversion_mode"))); void adc_set_conversion_time(u32 adc, u8 channel, u8 time) __attribute__ ((deprecated ("change to adc_set_sample_time"))); void adc_set_conversion_time_on_all_channels(u32 adc, u8 time) __attribute__ ((deprecated ("change to adc_set_sample_time_on_all_channels"))); void adc_enable_jeoc_interrupt(u32 adc) __attribute__ ((deprecated ("change to adc_enable_eoc_interrupt_injected"))); void adc_disable_jeoc_interrupt(u32 adc) __attribute__ ((deprecated ("change to adc_disable_eoc_interrupt_injected"))); +#else +void adc_set_continous_conversion_mode(u32 adc) __attribute__ ((deprecated)); +void adc_set_conversion_time(u32 adc, u8 channel, u8 time) __attribute__ ((deprecated)); +void adc_set_conversion_time_on_all_channels(u32 adc, u8 time) __attribute__ ((deprecated)); +void adc_enable_jeoc_interrupt(u32 adc) __attribute__ ((deprecated)); +void adc_disable_jeoc_interrupt(u32 adc) __attribute__ ((deprecated)); +#endif #endif END_DECLS -- cgit v1.2.3