summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2016-06-25 10:05:59 +1000
committer Vas Crabb <vas@vastheman.com>2016-06-25 10:05:59 +1000
commitc33946ba0b0b9b18f21302fd60711a59314674c9 (patch)
tree48e43001af0df2a944082e60b6a69570d0d4ebfd
parente363c5e154994dc647c7318cefa967f672663fb7 (diff)
Fix path with missing return, hopefully fix OSX build (nw)
-rw-r--r--src/osd/modules/file/posixdir.cpp10
-rw-r--r--src/osd/modules/file/windir.cpp3
2 files changed, 5 insertions, 8 deletions
diff --git a/src/osd/modules/file/posixdir.cpp b/src/osd/modules/file/posixdir.cpp
index 5b86a92444e..27e58cbae51 100644
--- a/src/osd/modules/file/posixdir.cpp
+++ b/src/osd/modules/file/posixdir.cpp
@@ -39,6 +39,10 @@
#undef _POSIX_C_SOURCE // to get DT_xxx on OS X
+// #include this stuff before something else can #define _POSIX_C_SOURCE again
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include "osdcore.h"
#include "modules/lib/osdlib.h"
@@ -51,10 +55,6 @@
#include <string>
#include <utility>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
namespace osd {
@@ -65,10 +65,8 @@ namespace {
#if defined(WIN32)
constexpr char PATHSEPCH = '\\';
-constexpr char INVPATHSEPCH = '/';
#else
constexpr char PATHSEPCH = '/';
-//constexpr char INVPATHSEPCH = '\\';
#endif
#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(EMSCRIPTEN) || defined(__ANDROID__) || defined(WIN32) || defined(SDLMAME_NO64BITIO)
diff --git a/src/osd/modules/file/windir.cpp b/src/osd/modules/file/windir.cpp
index e6eecfab4a2..f20f95f9a31 100644
--- a/src/osd/modules/file/windir.cpp
+++ b/src/osd/modules/file/windir.cpp
@@ -127,8 +127,7 @@ bool win_directory::open(std::string const &dirname)
// attempt to find the first file
m_find = FindFirstFileEx(dirfilter.get(), FindExInfoStandard, &m_data, FindExSearchNameMatch, nullptr, 0);
- if (m_find == INVALID_HANDLE_VALUE)
- return false;
+ return m_find != INVALID_HANDLE_VALUE;
}
} // anonymous namespace