Skip to content

Use _WIN32 only to check for windows #531

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

Closed
wants to merge 1 commit into from
Closed

Use _WIN32 only to check for windows #531

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
25 changes: 14 additions & 11 deletions simplecpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
* Copyright (C) 2016-2023 simplecpp team
*/

#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
# define _WIN32_WINNT 0x0602
#if defined(_WIN32)
# ifndef _WIN32_WINNT
# define _WIN32_WINNT 0x0602
# endif
# define NOMINMAX
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# undef ERROR
#endif
Expand Down Expand Up @@ -33,7 +36,7 @@
#include <stack>
#include <stdexcept>
#include <string>
#ifdef SIMPLECPP_WINDOWS
#ifdef _WIN32
# include <mutex>
#endif
#include <unordered_map>
Expand Down Expand Up @@ -2415,7 +2418,7 @@ namespace simplecpp {
#endif
}

#ifdef SIMPLECPP_WINDOWS
#ifdef _WIN32
static bool isAbsolutePath(const std::string &path)
{
if (path.length() >= 3 && path[0] > 0 && std::isalpha(path[0]) && path[1] == ':' && (path[2] == '\\' || path[2] == '/'))
Expand Down Expand Up @@ -2941,7 +2944,7 @@ static const simplecpp::Token *gotoNextLine(const simplecpp::Token *tok)
return tok;
}

#ifdef SIMPLECPP_WINDOWS
#ifdef _WIN32

class NonExistingFilesCache {
public:
Expand Down Expand Up @@ -2973,14 +2976,14 @@ static NonExistingFilesCache nonExistingFilesCache;

static std::string openHeaderDirect(std::ifstream &f, const std::string &path)
{
#ifdef SIMPLECPP_WINDOWS
#ifdef _WIN32
if (nonExistingFilesCache.contains(path))
return ""; // file is known not to exist, skip expensive file open call
#endif
f.open(path.c_str());
if (f.is_open())
return path;
#ifdef SIMPLECPP_WINDOWS
#ifdef _WIN32
nonExistingFilesCache.add(path);
#endif
return "";
Expand Down Expand Up @@ -3082,8 +3085,8 @@ std::pair<simplecpp::FileData *, bool> simplecpp::FileDataCache::get(const std::

bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)
{
#ifdef SIMPLECPP_WINDOWS
HANDLE hFile = CreateFileA(path.c_str(), 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
#ifdef _WIN32
HANDLE hFile = CreateFileA(path.c_str(), 0, FILE_SHARE_READ | FILE_SHARE_WRITE, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);

if (hFile == INVALID_HANDLE_VALUE)
return false;
Expand All @@ -3108,7 +3111,7 @@ bool simplecpp::FileDataCache::getFileId(const std::string &path, FileID &id)

simplecpp::FileDataCache simplecpp::load(const simplecpp::TokenList &rawtokens, std::vector<std::string> &filenames, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, FileDataCache cache)
{
#ifdef SIMPLECPP_WINDOWS
#ifdef _WIN32
if (dui.clearIncludeCache)
nonExistingFilesCache.clear();
#endif
Expand Down Expand Up @@ -3243,7 +3246,7 @@ static std::string getTimeDefine(const struct tm *timep)

void simplecpp::preprocess(simplecpp::TokenList &output, const simplecpp::TokenList &rawtokens, std::vector<std::string> &files, simplecpp::FileDataCache &cache, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage, std::list<simplecpp::IfCond> *ifCond)
{
#ifdef SIMPLECPP_WINDOWS
#ifdef _WIN32
if (dui.clearIncludeCache)
nonExistingFilesCache.clear();
#endif
Expand Down
10 changes: 3 additions & 7 deletions simplecpp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@
#ifndef simplecppH
#define simplecppH

#if defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
# define SIMPLECPP_WINDOWS
#endif

#include <cctype>
#include <cstring>
#include <iosfwd>
Expand Down Expand Up @@ -43,7 +39,7 @@
# define SIMPLECPP_LIB
#endif

#ifdef SIMPLECPP_WINDOWS
#ifdef _WIN32
# include <cstdint>
#else
# include <sys/stat.h>
Expand Down Expand Up @@ -471,7 +467,7 @@ namespace simplecpp {

private:
struct FileID {
#ifdef SIMPLECPP_WINDOWS
#ifdef _WIN32
struct {
std::uint64_t VolumeSerialNumber;
struct {
Expand All @@ -495,7 +491,7 @@ namespace simplecpp {
#endif
struct Hasher {
std::size_t operator()(const FileID &id) const {
#ifdef SIMPLECPP_WINDOWS
#ifdef _WIN32
return static_cast<std::size_t>(id.fileIdInfo.FileId.IdentifierHi ^ id.fileIdInfo.FileId.IdentifierLo ^
id.fileIdInfo.VolumeSerialNumber);
#else
Expand Down