Windows ifdef

20b8bb4a · biagio montesano · 0df49911 · 20b8bb4a
Commit 20b8bb4a authored Jul 31, 2014 by biagio montesano
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

bitops.hpp ...ine_descriptor/include/opencv2/line_descriptor/bitops.hpp +8 -2

No files found.
--- a/modules/line_descriptor/include/opencv2/line_descriptor/bitops.hpp
+++ b/modules/line_descriptor/include/opencv2/line_descriptor/bitops.hpp
@@ -43,9 +43,15 @@
 #ifndef __OPENCV_BITOPTS_HPP
 #define __OPENCV_BITOPTS_HPP

-#define popcntll __builtin_popcountll
-#define popcnt __builtin_popcount
+#ifdef __MSC_VER
+# include <intrin.h>
+# define popcnt __popcnt
+# define popcntll __popcount64
+#else
+# define popcntll __builtin_popcountll
+# define popcnt __builtin_popcount

+#endif

 /* LUT */
 const int lookup[] =