From 6d614ac1a7a0102391e18567843d5f764c32655b Mon Sep 17 00:00:00 2001 From: Piotr Gregor Date: Fri, 8 Jul 2016 17:07:23 +0100 Subject: [PATCH] FS-9009 [mod_avmd] #fix build on Windows Windows VC doesn't accept function __attribute__(s) --- src/mod/applications/mod_avmd/avmd_amplitude.h | 5 +++++ src/mod/applications/mod_avmd/avmd_desa2.h | 6 ++++++ src/mod/applications/mod_avmd/avmd_desa2_tweaked.h | 5 +++++ src/mod/applications/mod_avmd/mod_avmd.c | 1 + 4 files changed, 17 insertions(+) diff --git a/src/mod/applications/mod_avmd/avmd_amplitude.h b/src/mod/applications/mod_avmd/avmd_amplitude.h index 13e5edadeb..0878390935 100644 --- a/src/mod/applications/mod_avmd/avmd_amplitude.h +++ b/src/mod/applications/mod_avmd/avmd_amplitude.h @@ -15,6 +15,11 @@ #include "avmd_buffer.h" +#ifdef WIN32 +#define __attribute__(x) +#endif + + double avmd_amplitude(circ_buffer_t *, size_t i, double f) __attribute__ ((nonnull(1))); diff --git a/src/mod/applications/mod_avmd/avmd_desa2.h b/src/mod/applications/mod_avmd/avmd_desa2.h index 1da9ef346e..d555df448e 100644 --- a/src/mod/applications/mod_avmd/avmd_desa2.h +++ b/src/mod/applications/mod_avmd/avmd_desa2.h @@ -15,6 +15,12 @@ #include #include "avmd_buffer.h" + +#ifdef WIN32 +#define __attribute__(x) +#endif + + /* Returns digital frequency estimation and amplitude estimation. */ extern double avmd_desa2(circ_buffer_t *b, size_t i, double *amplitude) __attribute__ ((nonnull(1,3))); diff --git a/src/mod/applications/mod_avmd/avmd_desa2_tweaked.h b/src/mod/applications/mod_avmd/avmd_desa2_tweaked.h index 997abbb84d..2d16ca2972 100644 --- a/src/mod/applications/mod_avmd/avmd_desa2_tweaked.h +++ b/src/mod/applications/mod_avmd/avmd_desa2_tweaked.h @@ -21,6 +21,11 @@ #include +#ifdef WIN32 +#define __attribute__(x) +#endif + + /* Instead of returning digital frequency estimation using * result = 0.5 * acos(n/d), * which involves expensive computation of arc cosine on diff --git a/src/mod/applications/mod_avmd/mod_avmd.c b/src/mod/applications/mod_avmd/mod_avmd.c index 5fa0bb474f..5f235260b5 100644 --- a/src/mod/applications/mod_avmd/mod_avmd.c +++ b/src/mod/applications/mod_avmd/mod_avmd.c @@ -35,6 +35,7 @@ #include #include #include + #ifdef WIN32 #include #define ISNAN(x) (!!(_isnan(x)))