From e1b84e31f2b53bf10fddec575eeb1096aac8bf17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Cecilia=20Luque?= <a.cecilia.luque@gmail.com>
Date: Wed, 17 Sep 2014 22:09:28 +0200
Subject: [PATCH] Modifications to allow volk_gnsssdr+volk functions

Modified the templates of the module volk_gnsssdr to generate the
header files with some changes that allow running volk_gnsssdr
functions and volk standard functions at the same time in a file.
---
 src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h     | 4 ++--
 .../libs/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h   | 4 ++--
 src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h | 4 ++--
 .../libs/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h       | 4 ++--
 .../libs/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h       | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h b/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h
index 16d0934e9..f05b86613 100644
--- a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h
+++ b/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_VOLK_RUNTIME
-#define INCLUDED_VOLK_RUNTIME
+#ifndef INCLUDED_VOLK_GNSSSDR_RUNTIME
+#define INCLUDED_VOLK_GNSSSDR_RUNTIME
 
 #include <volk_gnsssdr/volk_gnsssdr_typedefs.h>
 #include <volk_gnsssdr/volk_gnsssdr_config_fixed.h>
diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h b/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h
index e1c01ae77..d33c61541 100644
--- a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h
+++ b/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_VOLK_CONFIG_FIXED_H
-#define INCLUDED_VOLK_CONFIG_FIXED_H
+#ifndef INCLUDED_VOLK_GNSSSDR_CONFIG_FIXED_H
+#define INCLUDED_VOLK_GNSSSDR_CONFIG_FIXED_H
 
 #for $i, $arch in enumerate($archs)
 #define LV_$(arch.name.upper()) $i
diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h b/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h
index 5e6e2bb6a..90c3f4472 100644
--- a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h
+++ b/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_VOLK_CPU_H
-#define INCLUDED_VOLK_CPU_H
+#ifndef INCLUDED_VOLK_GNSSSDR_CPU_H
+#define INCLUDED_VOLK_GNSSSDR_CPU_H
 
 #include <volk_gnsssdr/volk_gnsssdr_common.h>
 
diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h b/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h
index 98edb724e..ece5cb004 100644
--- a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h
+++ b/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_LIBVOLK_MACHINES_H
-#define INCLUDED_LIBVOLK_MACHINES_H
+#ifndef INCLUDED_LIBVOLK_GNSSSDR_MACHINES_H
+#define INCLUDED_LIBVOLK_GNSSSDR_MACHINES_H
 
 #include <volk_gnsssdr/volk_gnsssdr_common.h>
 #include <volk_gnsssdr/volk_gnsssdr_typedefs.h>
diff --git a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h b/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h
index 1de950b61..6403d7edd 100644
--- a/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h
+++ b/src/algorithms/libs/volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h
@@ -19,8 +19,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_VOLK_TYPEDEFS
-#define INCLUDED_VOLK_TYPEDEFS
+#ifndef INCLUDED_VOLK_GNSSSDR_TYPEDEFS
+#define INCLUDED_VOLK_GNSSSDR_TYPEDEFS
 
 #include <inttypes.h>
 #include <volk_gnsssdr/volk_gnsssdr_complex.h>