forked from qt-creator/qt-creator
Replace WIN32 define with _WIN32
Only MinGW gcc defines WIN32, MSVC compiler does not. It's also defined by qmake (msvc-desktop.conf), but not by qbs ... Let's just use _WIN32, that's defined everywhere. Change-Id: I8342a70498be54a965dcf7fae63eaf406aaa3c04 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -25,6 +25,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <qsystemdetection.h>
|
||||
|
||||
#include <cstdlib>
|
||||
#include <cstring>
|
||||
#include <memory>
|
||||
@@ -35,7 +37,7 @@ namespace Memory {
|
||||
|
||||
inline char *allocate(std::size_t size)
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef Q_OS_WIN32
|
||||
return static_cast<char*>(_aligned_malloc(size, 64));
|
||||
#else
|
||||
return static_cast<char*>(std::malloc(size));
|
||||
@@ -44,7 +46,7 @@ inline char *allocate(std::size_t size)
|
||||
|
||||
inline void deallocate(char *memory)
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef Q_OS_WIN32
|
||||
_aligned_free(memory);
|
||||
#else
|
||||
#pragma GCC diagnostic push
|
||||
@@ -58,7 +60,7 @@ inline void deallocate(char *memory)
|
||||
|
||||
inline char *reallocate(char *oldMemory, std::size_t newSize)
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef Q_OS_WIN32
|
||||
return static_cast<char*>(_aligned_realloc(oldMemory, newSize, 64));
|
||||
#else
|
||||
return static_cast<char*>(std::realloc(oldMemory, newSize));
|
||||
|
@@ -35,7 +35,7 @@ namespace ClangBackEnd {
|
||||
using USRName = llvm::SmallVector<char, 128>;
|
||||
|
||||
// use std::filesystem::path if it is supported by all compilers
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
const char nativeSeperator = '\\';
|
||||
#else
|
||||
const char nativeSeperator = '/';
|
||||
|
@@ -58,7 +58,7 @@ Utils::SmallString fromNativePath(Container container)
|
||||
{
|
||||
Utils::SmallString path(container.data(), container.size());
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
std::replace(path.begin(), path.end(), '\\', '/');
|
||||
#endif
|
||||
|
||||
|
@@ -43,7 +43,7 @@ namespace {
|
||||
|
||||
std::string toNativePath(std::string &&path)
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
std::replace(path.begin(), path.end(), '/', '\\');
|
||||
#endif
|
||||
|
||||
|
@@ -28,7 +28,7 @@
|
||||
#include <string>
|
||||
|
||||
// use std::filesystem::path if it is supported by all compilers
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
const char nativeSeperator = '\\';
|
||||
#else
|
||||
const char nativeSeperator = '/';
|
||||
@@ -37,7 +37,7 @@ const char nativeSeperator = '/';
|
||||
inline
|
||||
std::string toNativePath(std::string &&path)
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
std::replace(path.begin(), path.end(), '/', '\\');
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user