From 9347fc1ddb033444bf2b15a1f91b91069c56081b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 20 Aug 2009 15:32:02 +0000 Subject: [PATCH] From Colin McDonald, "This file didn't build when OSG_USE_UTF8_FILENAME was on" --- src/osgDB/ReaderWriter.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/osgDB/ReaderWriter.cpp b/src/osgDB/ReaderWriter.cpp index f487fb6ef..5a81c8772 100644 --- a/src/osgDB/ReaderWriter.cpp +++ b/src/osgDB/ReaderWriter.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include using namespace osgDB; @@ -118,20 +119,7 @@ ReaderWriter::FeatureList ReaderWriter::featureAsString(ReaderWriter::Features f return result; } -#if defined(WIN32) && !defined(__CYGWIN__) - #include - #ifndef F_OK - #define F_OK 4 - #endif -#else - #include -#endif - bool ReaderWriter::fileExists(const std::string& filename, const Options* /*options*/) const { -#ifdef OSG_USE_UTF8_FILENAME - return _waccess( OSGDB_STRING_TO_FILENAME(filename).c_str(), F_OK ) == 0; -#else - return access( filename.c_str(), F_OK ) == 0; -#endif + return ::osgDB::fileExists(filename); }