diff --git a/appveyor.yml b/appveyor.yml index 7440cb4..0dc903a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,7 +45,9 @@ - msbuild /m /p:Configuration="%CONFIGURATION%" /p:Platform="%PLATFORM%" utest.sln - copy %CONFIGURATION%\utest_test.exe utest_test.exe - copy %CONFIGURATION%\utest_test_wpo.exe utest_test_wpo.exe + - copy %CONFIGURATION%\utest_test_wpo.exe utest_test_mt.exe test_script: - utest_test.exe - utest_test_wpo.exe + - utest_test_mt.exe diff --git a/appveyor.yml b/appveyor.yml index 7440cb4..0dc903a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -45,7 +45,9 @@ - msbuild /m /p:Configuration="%CONFIGURATION%" /p:Platform="%PLATFORM%" utest.sln - copy %CONFIGURATION%\utest_test.exe utest_test.exe - copy %CONFIGURATION%\utest_test_wpo.exe utest_test_wpo.exe + - copy %CONFIGURATION%\utest_test_wpo.exe utest_test_mt.exe test_script: - utest_test.exe - utest_test_wpo.exe + - utest_test_mt.exe diff --git a/utest.h b/utest.h index 58c83c7..fdfceae 100644 --- a/utest.h +++ b/utest.h @@ -68,21 +68,29 @@ #pragma warning(pop) #endif +#if defined(__cplusplus) +#define UTEST_C_FUNC extern "C" +#else +#define UTEST_C_FUNC +#endif + #if defined(_MSC_VER) typedef union { struct { unsigned long LowPart; - long HighPart; + long HighPart; } DUMMYSTRUCTNAME; struct { unsigned long LowPart; - long HighPart; + long HighPart; } u; utest_int64_t QuadPart; } utest_large_integer; -__declspec(dllimport) int __stdcall QueryPerformanceCounter(utest_large_integer *); -__declspec(dllimport) int __stdcall QueryPerformanceFrequency(utest_large_integer *); +UTEST_C_FUNC __declspec(dllimport) int __stdcall QueryPerformanceCounter( + utest_large_integer *); +UTEST_C_FUNC __declspec(dllimport) int __stdcall QueryPerformanceFrequency( + utest_large_integer *); #elif defined(__linux__) /* @@ -117,12 +125,6 @@ #define UTEST_PRIu64 "I64u" #define UTEST_INLINE __forceinline -#if defined(__cplusplus) -#define UTEST_C_FUNC extern "C" -#else -#define UTEST_C_FUNC -#endif - #if defined(_WIN64) #define UTEST_SYMBOL_PREFIX #else