[hamradio-commits] [gnss-sdr] 109/303: Define prefetch macros even if volk ones were already included

[Carles Fernandez]

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

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

commit def78e3098385a2144a1016daed495308e64cfc7
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun Oct 16 12:11:41 2016 +0200

    Define prefetch macros even if volk ones were already included
---
 .../include/volk_gnsssdr/volk_gnsssdr_common.h     | 24 ++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h
index c9432e5..807af9f 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_common.h
@@ -21,6 +21,23 @@
  * along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef INCLUDED_LIBVOLK_GNSSSDR_COMMON_H
+#define INCLUDED_LIBVOLK_GNSSSDR_COMMON_H
+
+////////////////////////////////////////////////////////////////////////
+// Cross-platform attribute macros not included in VOLK
+////////////////////////////////////////////////////////////////////////
+#if defined __GNUC__
+#  define __VOLK_PREFETCH(addr) __builtin_prefetch(addr)
+#  define __VOLK_PREFETCH_LOCALITY(addr, rw, locality) __builtin_prefetch(addr, rw, locality)
+#elif _MSC_VER
+#  define __VOLK_PREFETCH(addr)
+#  define __VOLK_PREFETCH_LOCALITY(addr, rw, locality)
+#else
+#  define __VOLK_PREFETCH(addr)
+#  define __VOLK_PREFETCH_LOCALITY(addr, rw, locality)
+#endif
+
 #ifndef INCLUDED_LIBVOLK_COMMON_H
 #define INCLUDED_LIBVOLK_COMMON_H
 
@@ -39,8 +56,6 @@
 #    define __VOLK_ATTR_EXPORT
 #    define __VOLK_ATTR_IMPORT
 #  endif
-#  define __VOLK_PREFETCH(addr) __builtin_prefetch(addr)
-#  define __VOLK_PREFETCH_LOCALITY(addr, rw, locality) __builtin_prefetch(addr, rw, locality)
 #elif _MSC_VER
 #  define __VOLK_ATTR_ALIGNED(x) __declspec(align(x))
 #  define __VOLK_ATTR_UNUSED
@@ -48,8 +63,6 @@
 #  define __VOLK_ATTR_DEPRECATED __declspec(deprecated)
 #  define __VOLK_ATTR_EXPORT     __declspec(dllexport)
 #  define __VOLK_ATTR_IMPORT     __declspec(dllimport)
-#  define __VOLK_PREFETCH(addr)
-#  define __VOLK_PREFETCH_LOCALITY(addr, rw, locality)
 #else
 #  define __VOLK_ATTR_ALIGNED(x)
 #  define __VOLK_ATTR_UNUSED
@@ -57,8 +70,6 @@
 #  define __VOLK_ATTR_DEPRECATED
 #  define __VOLK_ATTR_EXPORT
 #  define __VOLK_ATTR_IMPORT
-#  define __VOLK_PREFETCH(addr)
-#  define __VOLK_PREFETCH_LOCALITY(addr, rw, locality)
 #endif
 
 ////////////////////////////////////////////////////////////////////////
@@ -139,3 +150,4 @@ union bit256{
 #define bit256_p(x) ((union bit256 *)(x))
 
 #endif /* INCLUDED_LIBVOLK_COMMON_H */
+#endif /* INCLUDED_LIBVOLK_GNSSSDR_COMMON_H */

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