Merge pull request #3493 from parnic/support-platforms-without-realpath

Fix build for platforms not supporting realpath
This commit is contained in:
Wouter van Oortmerssen
2016-01-06 11:52:37 -08:00

View File

@@ -219,6 +219,9 @@ inline void EnsureDirExists(const std::string &filepath) {
// Obtains the absolute path from any other path. // Obtains the absolute path from any other path.
// Returns the input path if the absolute path couldn't be resolved. // Returns the input path if the absolute path couldn't be resolved.
inline std::string AbsolutePath(const std::string &filepath) { inline std::string AbsolutePath(const std::string &filepath) {
#ifdef FLATBUFFERS_NO_ABSOLUTE_PATH_RESOLUTION
return filepath;
#else
#ifdef _WIN32 #ifdef _WIN32
char abs_path[MAX_PATH]; char abs_path[MAX_PATH];
return GetFullPathNameA(filepath.c_str(), MAX_PATH, abs_path, nullptr) return GetFullPathNameA(filepath.c_str(), MAX_PATH, abs_path, nullptr)
@@ -228,6 +231,7 @@ inline std::string AbsolutePath(const std::string &filepath) {
#endif #endif
? abs_path ? abs_path
: filepath; : filepath;
#endif // FLATBUFFERS_NO_ABSOLUTE_PATH_RESOLUTION
} }
// To and from UTF-8 unicode conversion functions // To and from UTF-8 unicode conversion functions