Avoid clash of redefined macros with Volk

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.cc

@@ -39,7 +39,7 @@
 #include <glog/logging.h>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
-#include <volk/volk.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <cstring>
 
 

src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition.h

@@ -56,7 +56,7 @@
 #include <armadillo>
 #include <gnuradio/block.h>
 #include <gnuradio/fft/fft.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
+#include <volk/volk.h>
 #include <string>
 
 typedef struct

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/tmpl/volk_gnsssdr_config_fixed.tmpl.h

@@ -21,9 +21,9 @@
 
 // clang-format off
 %for i, arch in enumerate(archs):
-//#ifndef LV_${arch.name.upper()}
+#ifndef LV_${arch.name.upper()}
 #define LV_${arch.name.upper()} ${i}
-//#endif
+#endif
 %endfor
 // clang-format on
 #endif /*INCLUDED_VOLK_GNSSSDR_CONFIG_FIXED*/

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.cc

@@ -49,7 +49,6 @@
 #include <gnuradio/io_signature.h>
 #include <matio.h>
 #include <pmt/pmt.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <glog/logging.h>
 #include <cmath>
 #include <iostream>

src/algorithms/tracking/gnuradio_blocks/glonass_l1_ca_dll_pll_c_aid_tracking_sc.h

@@ -47,7 +47,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
-#include <volk/volk.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <fstream>
 #include <map>
 #include <string>

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.cc

@@ -47,7 +47,6 @@
 #include <gnuradio/io_signature.h>
 #include <matio.h>
 #include <pmt/pmt.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <glog/logging.h>
 #include <cmath>
 #include <iostream>

src/algorithms/tracking/gnuradio_blocks/glonass_l2_ca_dll_pll_c_aid_tracking_sc.h

@@ -45,7 +45,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
-#include <volk/volk.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <fstream>
 #include <map>
 #include <string>

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_cc.cc

@@ -39,7 +39,6 @@
 #include <boost/bind.hpp>
 #include <gnuradio/io_signature.h>
 #include <matio.h>
-#include <pmt/pmt.h>
 #include <volk_gnsssdr/volk_gnsssdr.h>
 #include <glog/logging.h>
 #include <cmath>

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.cc

@@ -42,7 +42,6 @@
 #include <gnuradio/io_signature.h>
 #include <matio.h>
 #include <pmt/pmt.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <glog/logging.h>
 #include <cmath>
 #include <iostream>

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_fpga_sc.h

@@ -46,7 +46,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
-#include <volk/volk.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <fstream>
 #include <map>
 #include <string>

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.cc

@@ -40,7 +40,6 @@
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <pmt/pmt.h>
-#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <glog/logging.h>
 #include <matio.h>
 #include <cmath>

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_c_aid_tracking_sc.h

@@ -45,7 +45,7 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
-#include <volk/volk.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
 #include <fstream>
 #include <map>
 #include <string>