summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJukka Ojanen <jukka.ojanen@linkotec.net>2014-11-16 14:59:46 +0200
committerJukka Ojanen <jukka.ojanen@linkotec.net>2014-11-16 14:59:46 +0200
commitbcfd774b9d980de45afa643f1c734f799770a870 (patch)
tree7ad46df01ee80b334413669f0d7afe20b6a541dc
parentaf8d306ec3eb4bac01af536bda2d88743ae2559c (diff)
downloadffts-bcfd774b9d980de45afa643f1c734f799770a870.zip
ffts-bcfd774b9d980de45afa643f1c734f799770a870.tar.gz
Rename src/ffts.h to src/ffts_internal.h to avoid conflicts with include/ffts.h
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/codegen.c2
-rw-r--r--src/codegen.h2
-rw-r--r--src/ffts.c2
-rw-r--r--src/ffts_internal.h (renamed from src/ffts.h)0
-rw-r--r--src/ffts_nd.h2
-rw-r--r--src/ffts_real.h2
-rw-r--r--src/ffts_real_nd.h2
-rw-r--r--src/ffts_small.h2
9 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8de7302..4adbb64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(FFTS_SOURCES
src/ffts_attributes.h
src/ffts.c
- src/ffts.h
+ src/ffts_internal.h
src/ffts_nd.c
src/ffts_nd.h
src/ffts_real.h
diff --git a/src/codegen.c b/src/codegen.c
index 0aeacff..e1ed11f 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -33,7 +33,7 @@
#include "codegen.h"
#include "macros.h"
-#include "ffts.h"
+#include "ffts_internal.h"
#ifdef __arm__
typedef uint32_t insns_t;
diff --git a/src/codegen.h b/src/codegen.h
index e3c2381..bb5b60b 100644
--- a/src/codegen.h
+++ b/src/codegen.h
@@ -38,7 +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.c b/src/ffts.c
index d6a2b15..545138b 100644
--- a/src/ffts.c
+++ b/src/ffts.c
@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "ffts.h"
+#include "ffts_internal.h"
#include "macros.h"
#include "patterns.h"
#include "ffts_small.h"
diff --git a/src/ffts.h b/src/ffts_internal.h
index a8e27b8..a8e27b8 100644
--- a/src/ffts.h
+++ b/src/ffts_internal.h
diff --git a/src/ffts_nd.h b/src/ffts_nd.h
index a960cad..dd31dd1 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.h"
+#include "ffts_internal.h"
#include <stddef.h>
ffts_plan_t *ffts_init_nd(int rank, size_t *Ns, int sign);
diff --git a/src/ffts_real.h b/src/ffts_real.h
index 81ca80f..f7f3d6a 100644
--- a/src/ffts_real.h
+++ b/src/ffts_real.h
@@ -38,7 +38,7 @@
#pragma once
#endif
-#include "ffts.h"
+#include "ffts_internal.h"
#include <stddef.h>
ffts_plan_t *ffts_init_1d_real(size_t N, int sign);
diff --git a/src/ffts_real_nd.h b/src/ffts_real_nd.h
index d23a002..1ad7026 100644
--- a/src/ffts_real_nd.h
+++ b/src/ffts_real_nd.h
@@ -38,7 +38,7 @@
#pragma once
#endif
-#include "ffts.h"
+#include "ffts_internal.h"
#include <stddef.h>
ffts_plan_t *ffts_init_nd_real(int rank, size_t *Ns, int sign);
diff --git a/src/ffts_small.h b/src/ffts_small.h
index 5ae48cc..6632a8a 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.h"
+#include "ffts_internal.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);
OpenPOWER on IntegriCloud