Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/cxong/tinydir.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLautis Sun <lautis0503@gmail.com>2016-06-25 11:34:38 +0300
committerLautis Sun <lautis0503@gmail.com>2016-06-25 11:34:38 +0300
commitd34e7845c81efe630e1e1bea4cabdb5e56df916a (patch)
treeb6578ac0515e3c6ea69999200af2a63925bf503c /tinydir.h
parent4092c3d5e5f28e769f7035c511fc21c7717152f4 (diff)
Let Windows choose which function to use
Diffstat (limited to 'tinydir.h')
-rw-r--r--tinydir.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/tinydir.h b/tinydir.h
index 6353957..61d32af 100644
--- a/tinydir.h
+++ b/tinydir.h
@@ -52,9 +52,9 @@ extern "C" {
/* types */
/* Windows UNICODE wide character support */
-#if ((defined _MSC_VER) && (defined _UNICODE))
+#ifdef _MSC_VER
#define _tinydir_char_t TCHAR
-#define TINYDIR_STRING(s) TEXT(s)
+#define TINYDIR_STRING(s) _TEXT(s)
#define _tinydir_strlen _tcslen
#define _tinydir_strcpy _tcscpy
#define _tinydir_strcat _tcscat
@@ -237,7 +237,7 @@ int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path)
#ifdef _MSC_VER
_tinydir_strcpy(path_buf, dir->path);
_tinydir_strcat(path_buf, TINYDIR_STRING("\\*"));
- dir->_h = FindFirstFileA(path_buf, &dir->_f);
+ dir->_h = FindFirstFile(path_buf, &dir->_f);
if (dir->_h == INVALID_HANDLE_VALUE)
{
errno = ENOENT;
@@ -388,7 +388,7 @@ int tinydir_next(tinydir_dir *dir)
}
#ifdef _MSC_VER
- if (FindNextFileA(dir->_h, &dir->_f) == 0)
+ if (FindNextFile(dir->_h, &dir->_f) == 0)
#else
#ifdef _TINYDIR_USE_READDIR
dir->_e = readdir(dir->_d);