Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use _WIN32 instead of _MSC_VER to fix mingw build #245

Merged
merged 2 commits into from
Mar 17, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ImathTest/half_perf_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Copyright Contributors to the OpenEXR Project.
//

#ifdef _MSC_VER
#ifdef _WIN32
# define _CRT_RAND_S
#endif

Expand All @@ -14,7 +14,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef _MSC_VER
#ifdef _WIN32
# include <windows.h>
#else
# include <time.h>
Expand Down Expand Up @@ -271,7 +271,7 @@ exptable_half_constructor (float f)
int64_t
get_ticks (void)
{
#ifdef _MSC_VER
#ifdef _WIN32
static uint64_t scale = 0;
if (scale == 0)
{
Expand Down Expand Up @@ -387,7 +387,7 @@ main (int argc, char* argv[])
perf_test_half_to_float (floats, halfs, numentries);

// test float -> half with real-world values
#ifdef _MSC_VER
#ifdef _WIN32
unsigned int rv;
for (int i = 0; i < numentries; ++i)
{
Expand Down