diff options
author | Jukka Ojanen <jukka.ojanen@linkotec.net> | 2014-11-17 15:39:46 +0200 |
---|---|---|
committer | Jukka Ojanen <jukka.ojanen@linkotec.net> | 2014-11-17 15:39:46 +0200 |
commit | 71f1f4dae77c2f6b335c3e06c13a3ecedf73ccda (patch) | |
tree | dbadf84c5230d4ae8643207aa19ceeb8a09fd867 /src | |
parent | d77be00aaadd7772b364c10bff41a38e0112f59d (diff) | |
download | ffts-71f1f4dae77c2f6b335c3e06c13a3ecedf73ccda.zip ffts-71f1f4dae77c2f6b335c3e06c13a3ecedf73ccda.tar.gz |
Fix redefinition of ffts_plan_t
Diffstat (limited to 'src')
-rw-r--r-- | src/codegen.c | 1 | ||||
-rw-r--r-- | src/codegen.h | 1 | ||||
-rw-r--r-- | src/ffts_internal.h | 2 | ||||
-rw-r--r-- | src/ffts_nd.c | 2 | ||||
-rw-r--r-- | src/ffts_nd.h | 2 | ||||
-rw-r--r-- | src/ffts_real.c | 1 | ||||
-rw-r--r-- | src/ffts_real.h | 2 | ||||
-rw-r--r-- | src/ffts_real_nd.c | 2 | ||||
-rw-r--r-- | src/ffts_real_nd.h | 2 | ||||
-rw-r--r-- | src/ffts_small.c | 1 | ||||
-rw-r--r-- | src/ffts_small.h | 2 |
11 files changed, 9 insertions, 9 deletions
diff --git a/src/codegen.c b/src/codegen.c index 9f2921a..6180f94 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -33,7 +33,6 @@ #include "codegen.h" #include "macros.h" -#include "ffts_internal.h" #ifdef __arm__ typedef uint32_t insns_t; diff --git a/src/codegen.h b/src/codegen.h index bb5b60b..e170ca7 100644 --- a/src/codegen.h +++ b/src/codegen.h @@ -38,6 +38,7 @@ #pragma once #endif +#include "ffts.h" #include "ffts_internal.h" transform_func_t ffts_generate_func_code(ffts_plan_t *p, size_t N, size_t leaf_N, int sign); diff --git a/src/ffts_internal.h b/src/ffts_internal.h index 68a08db..413bb51 100644 --- a/src/ffts_internal.h +++ b/src/ffts_internal.h @@ -72,8 +72,6 @@ #define M_PI 3.1415926535897932384626433832795028841971693993751058209 #endif -typedef struct _ffts_plan_t ffts_plan_t; - typedef void (*transform_func_t)(ffts_plan_t *p, const void *in, void *out); /** diff --git a/src/ffts_nd.c b/src/ffts_nd.c index 60e78d4..3651d1f 100644 --- a/src/ffts_nd.c +++ b/src/ffts_nd.c @@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "ffts_nd.h" -#include "ffts.h" +#include "ffts_internal.h" #ifdef HAVE_NEON #include "neon.h" diff --git a/src/ffts_nd.h b/src/ffts_nd.h index dd31dd1..a960cad 100644 --- a/src/ffts_nd.h +++ b/src/ffts_nd.h @@ -34,7 +34,7 @@ #ifndef FFTS_ND_H #define FFTS_ND_H -#include "ffts_internal.h" +#include "ffts.h" #include <stddef.h> ffts_plan_t *ffts_init_nd(int rank, size_t *Ns, int sign); diff --git a/src/ffts_real.c b/src/ffts_real.c index 77c57a0..c2f03b7 100644 --- a/src/ffts_real.c +++ b/src/ffts_real.c @@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "ffts_real.h" +#include "ffts_internal.h" #ifdef HAVE_NEON #include <arm_neon.h> diff --git a/src/ffts_real.h b/src/ffts_real.h index f7f3d6a..81ca80f 100644 --- a/src/ffts_real.h +++ b/src/ffts_real.h @@ -38,7 +38,7 @@ #pragma once #endif -#include "ffts_internal.h" +#include "ffts.h" #include <stddef.h> ffts_plan_t *ffts_init_1d_real(size_t N, int sign); diff --git a/src/ffts_real_nd.c b/src/ffts_real_nd.c index fe9f646..8b66333 100644 --- a/src/ffts_real_nd.c +++ b/src/ffts_real_nd.c @@ -33,7 +33,7 @@ #include "ffts_real_nd.h" #include "ffts_real.h" -#include "ffts.h" +#include "ffts_internal.h" #ifdef __ARM_NEON__ #include "neon.h" diff --git a/src/ffts_real_nd.h b/src/ffts_real_nd.h index 1ad7026..d23a002 100644 --- a/src/ffts_real_nd.h +++ b/src/ffts_real_nd.h @@ -38,7 +38,7 @@ #pragma once #endif -#include "ffts_internal.h" +#include "ffts.h" #include <stddef.h> ffts_plan_t *ffts_init_nd_real(int rank, size_t *Ns, int sign); diff --git a/src/ffts_small.c b/src/ffts_small.c index 429991e..8fa373f 100644 --- a/src/ffts_small.c +++ b/src/ffts_small.c @@ -32,6 +32,7 @@ */ #include "ffts_small.h" +#include "ffts_internal.h" #include "macros.h" #include <stdlib.h> diff --git a/src/ffts_small.h b/src/ffts_small.h index 6632a8a..5ae48cc 100644 --- a/src/ffts_small.h +++ b/src/ffts_small.h @@ -1,7 +1,7 @@ #ifndef FFTS_SMALL_H #define FFTS_SMALL_H -#include "ffts_internal.h" +#include "ffts.h" void ffts_firstpass_16_f(ffts_plan_t *p, const void *in, void *out); void ffts_firstpass_16_b(ffts_plan_t *p, const void *in, void *out); |