Skip to content

Update WIN32 ifdef checks to _MSC_VER #114

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update WIN32 ifdef checks to _MSC_VER #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions inkcpp_compiler/binary_emitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <map>
#include <fstream>

#ifndef WIN32
#ifndef _MSC_VER
# include <cstring>
#endif

Expand All @@ -26,7 +26,7 @@ using std::string;

char* strtok_s(char* s, const char* sep, char** context)
{
#if defined(_WIN32) || defined(_WIN64)
#ifdef _MSC_VER
return ::strtok_s(s, sep, context);
#else
if (context == nullptr || sep == nullptr || (s == nullptr && *context == nullptr)) {
Expand Down
4 changes: 2 additions & 2 deletions inkcpp_compiler/reporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ namespace ink::compiler::internal
_list = list;

// Make sure our buffer is empty
#ifdef WIN32
#ifdef _MSC_VER
_Tidy();
#endif
}
Expand All @@ -90,7 +90,7 @@ namespace ink::compiler::internal

// Clear our state
_list = nullptr;
#ifdef WIN32
#ifdef _MSC_VER
_Tidy();
#endif

Expand Down
Loading