From b4fef31d8410afb2e5ee8d070ac777ebfb89b540 Mon Sep 17 00:00:00 2001 From: Chris Pickett Date: Wed, 6 Jan 2016 12:20:38 -0600 Subject: [PATCH] Made requested revisions for naming and spacing --- include/flatbuffers/util.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/include/flatbuffers/util.h b/include/flatbuffers/util.h index d2d8cae8e..2c3be68d3 100644 --- a/include/flatbuffers/util.h +++ b/include/flatbuffers/util.h @@ -219,19 +219,19 @@ inline void EnsureDirExists(const std::string &filepath) { // Obtains the absolute path from any other path. // Returns the input path if the absolute path couldn't be resolved. inline std::string AbsolutePath(const std::string &filepath) { -#ifdef NO_ABSOLUTE_PATH_RESOLUTION - return filepath; -#else - #ifdef _WIN32 - char abs_path[MAX_PATH]; - return GetFullPathNameA(filepath.c_str(), MAX_PATH, abs_path, nullptr) + #ifdef FLATBUFFERS_NO_ABSOLUTE_PATH_RESOLUTION + return filepath; #else - char abs_path[PATH_MAX]; - return realpath(filepath.c_str(), abs_path) - #endif - ? abs_path - : filepath; -#endif // NO_ABSOLUTE_PATH_RESOLUTION + #ifdef _WIN32 + char abs_path[MAX_PATH]; + return GetFullPathNameA(filepath.c_str(), MAX_PATH, abs_path, nullptr) + #else + char abs_path[PATH_MAX]; + return realpath(filepath.c_str(), abs_path) + #endif + ? abs_path + : filepath; + #endif // NO_ABSOLUTE_PATH_RESOLUTION } // To and from UTF-8 unicode conversion functions