From b835094682f214366f7b8c0220134817c4f34157 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 20 Jul 2011 17:36:08 -0700
Subject: volk: snagged the volk changes from cmake branch

---
 volk/lib/CMakeLists.txt | 2 +-
 volk/lib/volk_prefs.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'volk/lib')

diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index 33a478265..d69b4941d 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -256,6 +256,6 @@ ADD_EXECUTABLE(test_all
     ${CMAKE_CURRENT_SOURCE_DIR}/qa_utils.cc
 )
 TARGET_LINK_LIBRARIES(test_all volk ${Boost_LIBRARIES})
-ADD_TEST(qa_volk_test_all test_all)
+#ADD_TEST(qa_volk_test_all test_all)
 
 ENDIF()
diff --git a/volk/lib/volk_prefs.c b/volk/lib/volk_prefs.c
index 9743c51d9..b29d5fd87 100644
--- a/volk/lib/volk_prefs.c
+++ b/volk/lib/volk_prefs.c
@@ -23,7 +23,7 @@ int load_preferences(struct volk_arch_pref **prefs) {
     //get the config path
     get_config_path(path);
     config_file = fopen(path, "r");
-    if(!config_file) return; //no prefs found
+    if(!config_file) return n_arch_prefs; //no prefs found
 
     while(fgets(line, 512, config_file) != NULL) {
         if(sscanf(line, "%s %s", function, arch) == 2 && !strncmp(function, "volk_", 5)) {
-- 
cgit