potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

build: replace WIN32 => _WIN32

Browse Source
This commit is contained in:
Alexander Alekhin
2017-07-25 13:23:44 +03:00
parent 0194d5a2d5
commit 602f047fe8
59 changed files with 136 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ts/src/ts.cpp
+7 -7
View File
@@ -47,7 +47,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <time.h>
#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
#if defined _WIN32
#include <io.h>
#include <windows.h>
@@ -67,7 +67,7 @@
#endif
// isDirectory
#if defined WIN32 || defined _WIN32 || defined WINCE
#if defined _WIN32 || defined WINCE
# include <windows.h>
#else
# include <dirent.h>
@@ -100,7 +100,7 @@ static std::string path_join(const std::string& prefix, const std::string& subpa
// a few platform-dependent declarations
#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
#if defined _WIN32
#ifdef _MSC_VER
static void SEHTranslator( unsigned int /*u*/, EXCEPTION_POINTERS* pExp )
{
@@ -236,7 +236,7 @@ void BaseTest::safe_run( int start_from )
{
try
{
#if !defined WIN32 && !defined _WIN32
#if !defined _WIN32
int _code = setjmp( tsJmpMark );
if( !_code )
run( start_from );
@@ -491,7 +491,7 @@ void TS::init( const string& modulename )
if( ::testing::GTEST_FLAG(catch_exceptions) )
{
#if defined WIN32 || defined _WIN32
#if defined _WIN32
#ifdef _MSC_VER
_set_se_translator( SEHTranslator );
#endif
@@ -502,7 +502,7 @@ void TS::init( const string& modulename )
}
else
{
#if defined WIN32 || defined _WIN32
#if defined _WIN32
#ifdef _MSC_VER
_set_se_translator( 0 );
#endif
@@ -722,7 +722,7 @@ void parseCustomOptions(int argc, char **argv)
static bool isDirectory(const std::string& path)
{
#if defined WIN32 || defined _WIN32 || defined WINCE
#if defined _WIN32 || defined WINCE
WIN32_FILE_ATTRIBUTE_DATA all_attrs;
#ifdef WINRT
wchar_t wpath[MAX_PATH];