Merge branch 'win32-macro-fix'

Conflicts: tinydir.h
seanmiddleditch · Dec 15, 2014 · f0254be · f0254be
2 parents f1d6c50 + 3679b97
commit f0254be
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/tinydir.h b/tinydir.h
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef _MSC_VER
+#ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <tchar.h>
@@ -64,15 +64,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #define _TINYDIR_PATH_MAX 4096
-#ifdef _MSC_VER
+#ifdef _WIN32
 /* extra chars for the "\\*" mask */
 #define _TINYDIR_PATH_EXTRA 2
 #else
 #define _TINYDIR_PATH_EXTRA 0
 #endif
 #define _TINYDIR_FILENAME_MAX 256
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #define _TINYDIR_FUNC static __inline
 #else
 #define _TINYDIR_FUNC static __inline__
@@ -86,7 +86,7 @@ typedef struct
 	int is_dir;
 	int is_reg;
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 #else
 	struct stat _s;
 #endif
@@ -99,7 +99,7 @@ typedef struct
 	size_t n_files;
 
 	tinydir_file *_files;
-#ifdef _MSC_VER
+#ifdef _WIN32
 	HANDLE _h;
 	WIN32_FIND_DATA _f;
 #else
@@ -151,15 +151,15 @@ int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path)
 
 	/* initialise dir */
 	dir->_files = NULL;
-#ifdef _MSC_VER
+#ifdef _WIN32
 	dir->_h = INVALID_HANDLE_VALUE;
 #else
 	dir->_d = NULL;
 #endif
 	tinydir_close(dir);
 
 	_tinydir_strcpy(dir->path, path);
-#ifdef _MSC_VER
+#ifdef _WIN32
 	_tinydir_strcat(dir->path, TINYDIR_STRING("\\*"));
 	dir->_h = FindFirstFile(dir->path, &dir->_f);
 	dir->path[_tinydir_strlen(dir->path) - 2] = '\0';
@@ -175,7 +175,7 @@ int tinydir_open(tinydir_dir *dir, const _tinydir_char_t *path)
 
 	/* read first file */
 	dir->has_next = 1;
-#ifndef _MSC_VER
+#ifndef _WIN32
 	dir->_e = readdir(dir->_d);
 	if (dir->_e == NULL)
 	{
@@ -270,7 +270,7 @@ void tinydir_close(tinydir_dir *dir)
 		free(dir->_files);
 	}
 	dir->_files = NULL;
-#ifdef _MSC_VER
+#ifdef _WIN32
 	if (dir->_h != INVALID_HANDLE_VALUE)
 	{
 		FindClose(dir->_h);
@@ -300,15 +300,15 @@ int tinydir_next(tinydir_dir *dir)
 		return -1;
 	}
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 	if (FindNextFile(dir->_h, &dir->_f) == 0)
 #else
 	dir->_e = readdir(dir->_d);
 	if (dir->_e == NULL)
 #endif
 	{
 		dir->has_next = 0;
-#ifdef _MSC_VER
+#ifdef _WIN32
 		if (GetLastError() != ERROR_SUCCESS &&
 			GetLastError() != ERROR_NO_MORE_FILES)
 		{
@@ -330,7 +330,7 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
 		errno = EINVAL;
 		return -1;
 	}
-#ifdef _MSC_VER
+#ifdef _WIN32
 	if (dir->_h == INVALID_HANDLE_VALUE)
 #else
 	if (dir->_e == NULL)
@@ -341,7 +341,7 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
 	}
 	if (_tinydir_strlen(dir->path) +
 		_tinydir_strlen(
-#ifdef _MSC_VER
+#ifdef _WIN32
 			dir->_f.cFileName
 #else
 			dir->_e->d_name
@@ -354,7 +354,7 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
 		return -1;
 	}
 	if (_tinydir_strlen(
-#ifdef _MSC_VER
+#ifdef _WIN32
 			dir->_f.cFileName
 #else
 			dir->_e->d_name
@@ -368,14 +368,14 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
 	_tinydir_strcpy(file->path, dir->path);
 	_tinydir_strcat(file->path, TINYDIR_STRING("/"));
 	_tinydir_strcpy(file->name,
-#ifdef _MSC_VER
+#ifdef _WIN32
 		dir->_f.cFileName
 #else
 		dir->_e->d_name
 #endif
 	);
 	_tinydir_strcat(file->path, file->name);
-#ifndef _MSC_VER
+#ifndef _WIN32
 	if (stat(file->path, &file->_s) == -1)
 	{
 		return -1;
@@ -384,13 +384,13 @@ int tinydir_readfile(const tinydir_dir *dir, tinydir_file *file)
 	_tinydir_get_ext(file);
 
 	file->is_dir =
-#ifdef _MSC_VER
+#ifdef _WIN32
 		!!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY);
 #else
 		S_ISDIR(file->_s.st_mode);
 #endif
 	file->is_reg =
-#ifdef _MSC_VER
+#ifdef _WIN32
 		!!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_NORMAL) ||
 		(
 			!(dir->_f.dwFileAttributes & FILE_ATTRIBUTE_DEVICE) &&
@@ -467,7 +467,7 @@ int tinydir_file_open(tinydir_file *file, const _tinydir_char_t *path)
 	_tinydir_char_t file_name_buf[_TINYDIR_FILENAME_MAX];
 	_tinydir_char_t *dir_name;
 	_tinydir_char_t *base_name;
-#ifdef _MSC_VER
+#ifdef _WIN32
 	_tinydir_char_t drive_buf[_TINYDIR_PATH_MAX];
 	_tinydir_char_t ext_buf[_TINYDIR_FILENAME_MAX];
 #endif
@@ -484,7 +484,7 @@ int tinydir_file_open(tinydir_file *file, const _tinydir_char_t *path)
 	}
 
 	/* Get the parent path */
-#ifdef _MSC_VER
+#ifdef _WIN32
 #ifdef _UNICODE
 	if (_wsplitpath_s(
 #else