[hamradio-commits] [gnss-sdr] 77/149: avoiding redefinition of functions

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit 1d18ff6c1621df27c4bfd61a50c0c236dae4b011
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon Jan 18 23:50:34 2016 +0100

    avoiding redefinition of functions
---
 .../kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerpuppet_16ic.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerpuppet_16ic.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerpuppet_16ic.h
index 1b7d653..052218e 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerpuppet_16ic.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/kernels/volk_gnsssdr/volk_gnsssdr_16ic_resamplerpuppet_16ic.h
@@ -39,7 +39,7 @@
 
 
 #ifdef LV_HAVE_GENERIC
-static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_generic(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points)
+static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_u_generic(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points)
 {
     float rem_code_phase_chips = -0.123;
     float code_phase_step_chips = 0.1;
@@ -50,7 +50,7 @@ static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_generic(lv_16sc_t* res
 #endif /* LV_HAVE_GENERIC */
 
 #ifdef LV_HAVE_SSE2
-static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points)
+static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_u_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points)
 {
     float rem_code_phase_chips = -0.123;
     float code_phase_step_chips = 0.1;
@@ -71,7 +71,7 @@ static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_sse2(lv_16sc_t* result
 
 
 #ifdef LV_HAVE_GENERIC
-static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_generic(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points)
+static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_a_generic(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points)
 {
     float rem_code_phase_chips = -0.123;
     float code_phase_step_chips = 0.1;
@@ -82,7 +82,7 @@ static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_generic(lv_16sc_t* res
 #endif /* LV_HAVE_GENERIC */
 
 #ifdef LV_HAVE_SSE2
-static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points)
+static inline void volk_gnsssdr_16ic_resamplerpuppet_16ic_a_sse2(lv_16sc_t* result, const lv_16sc_t* local_code, unsigned int num_points)
 {
     float rem_code_phase_chips = -0.123;
     float code_phase_step_chips = 0.1;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git