From 0869c7b5b5df0e51424e04d1347fb0a04cf1d8c5 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 28 Dec 2016 12:05:48 -1000 Subject: [PATCH] This had better fix S_ISREG on Windows --- include/kabufuda/Util.hpp | 8 ++++++++ lib/kabufuda/Card.cpp | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/kabufuda/Util.hpp b/include/kabufuda/Util.hpp index e61909d..03c74da 100644 --- a/include/kabufuda/Util.hpp +++ b/include/kabufuda/Util.hpp @@ -320,6 +320,14 @@ static inline int Rename(const SystemChar* oldpath, const SystemChar* newpath) #endif } +#if !defined(S_ISREG) && defined(S_IFMT) && defined(S_IFREG) +#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG) +#endif + +#if !defined(S_ISDIR) && defined(S_IFMT) && defined(S_IFDIR) +#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR) +#endif + static inline int Stat(const SystemChar* path, Sstat* statOut) { #if CARD_UCS2 diff --git a/lib/kabufuda/Card.cpp b/lib/kabufuda/Card.cpp index f15b776..b57f305 100644 --- a/lib/kabufuda/Card.cpp +++ b/lib/kabufuda/Card.cpp @@ -4,7 +4,6 @@ #include #include #include -#include namespace kabufuda {