提交 0e8c2b03 编写于 作者: L Leszek Swirski

Fix visibility of g_linked_ptr_mutex on Windows

Reverts some changes in b8ed00bd
上级 54afb85d
......@@ -4,6 +4,14 @@
#include "opencv2/core/cvdef.h"
#include <stdarg.h> // for va_list
#include "cvconfig.h"
#ifndef GTEST_CREATE_SHARED_LIBRARY
#ifdef BUILD_SHARED_LIBS
#define GTEST_LINKED_AS_SHARED_LIBRARY 1
#endif
#endif
#ifdef _MSC_VER
#pragma warning( disable: 4127 )
#endif
......
......@@ -1912,7 +1912,19 @@ using ::std::tuple_size;
#endif // GTEST_HAS_SEH
#define GTEST_API_ CV_EXPORTS
#ifdef _MSC_VER
# if GTEST_LINKED_AS_SHARED_LIBRARY
# define GTEST_API_ __declspec(dllimport)
# elif GTEST_CREATE_SHARED_LIBRARY
# define GTEST_API_ __declspec(dllexport)
# endif
#endif // _MSC_VER
#ifndef GTEST_API_
# define GTEST_API_ CV_EXPORTS
#endif
#ifdef __GNUC__
// Ask the compiler to never inline a given function.
......
#ifndef __OPENCV_TS_PERF_HPP__
#define __OPENCV_TS_PERF_HPP__
#include "cvconfig.h"
#ifndef GTEST_CREATE_SHARED_LIBRARY
# ifdef BUILD_SHARED_LIBS
# define GTEST_LINKED_AS_SHARED_LIBRARY 1
# endif
#endif
#include "opencv2/core.hpp"
#include "ts_gtest.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册