From ab6f8142da17ee70effd469f20a41821b4bc4513 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 20 Oct 2011 14:00:14 -0700
Subject: removes gcc warning, dont need symbol export on plain c structs

---
 volk/include/volk/volk_prefs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'volk')

diff --git a/volk/include/volk/volk_prefs.h b/volk/include/volk/volk_prefs.h
index 2a7f7e79f..83d9baf89 100644
--- a/volk/include/volk/volk_prefs.h
+++ b/volk/include/volk/volk_prefs.h
@@ -5,7 +5,7 @@
 
 __VOLK_DECL_BEGIN
 
-struct VOLK_API volk_arch_pref {
+struct volk_arch_pref {
     char name[128];
     char arch[32];
 };
-- 
cgit 


From dfe18fee44d1c03af186aeacd2adc97b6b129297 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Thu, 20 Oct 2011 14:15:25 -0700
Subject: volk: give priority to generated includes (helps with dirty tree)

---
 volk/gen/make_makefile_am.py | 2 +-
 volk/lib/CMakeLists.txt      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'volk')

diff --git a/volk/gen/make_makefile_am.py b/volk/gen/make_makefile_am.py
index f843b4413..0dc088a80 100644
--- a/volk/gen/make_makefile_am.py
+++ b/volk/gen/make_makefile_am.py
@@ -25,8 +25,8 @@ def make_makefile_am(dom, machines, archflags_dict):
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) \
-	-I$(top_srcdir)/include \
 	-I$(top_gendir)/include \
+	-I$(top_srcdir)/include \
 	-Dvolk_EXPORTS \
 	-fvisibility=hidden \
 	$(WITH_INCLUDES)
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
index f4177b16e..e18d13677 100644
--- a/volk/lib/CMakeLists.txt
+++ b/volk/lib/CMakeLists.txt
@@ -231,10 +231,10 @@ if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
 endif()
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}/include
     ${CMAKE_BINARY_DIR}/include
-    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_SOURCE_DIR}/include
     ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
 list(APPEND volk_sources
-- 
cgit