Cleanup.

bkaradzic · Nov 17, 2017 · 451e30b · 451e30b · mmicko · Nov 18, 2017
1 parent 0c1354a
commit 451e30b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/include/bx/os.h b/include/bx/os.h
@@ -51,9 +51,6 @@ namespace bx
 	///
 	int chdir(const char* _path);
 
-	///
-	char* pwd(char* _buffer, uint32_t _size);
-
 	///
 	void* exec(const char* const* _argv);
 

diff --git a/src/filepath.cpp b/src/filepath.cpp
@@ -8,6 +8,12 @@
 #include <bx/os.h>
 #include <bx/readerwriter.h>
 
+#if BX_CRT_MSVC
+#	include <direct.h> // _getcwd
+#else
+#	include <unistd.h> // getcwd
+#endif // BX_CRT_MSVC
+
 #if BX_PLATFORM_WINDOWS
 extern "C" __declspec(dllimport) unsigned long __stdcall GetTempPathA(unsigned long _max, char* _ptr);
 #endif // BX_PLATFORM_WINDOWS
@@ -161,6 +167,20 @@ namespace bx
 		return false;
 	}
 
+	static char* pwd(char* _buffer, uint32_t _size)
+	{
+#if BX_PLATFORM_PS4     \
+ || BX_PLATFORM_XBOXONE \
+ || BX_PLATFORM_WINRT
+		BX_UNUSED(_buffer, _size);
+		return NULL;
+#elif BX_CRT_MSVC
+		return ::_getcwd(_buffer, (int)_size);
+#else
+		return ::getcwd(_buffer, _size);
+#endif // BX_COMPILER_
+	}
+
 	static bool getCurrentPath(char* _out, uint32_t* _inOutSize)
 	{
 		uint32_t len = *_inOutSize;

diff --git a/src/os.cpp b/src/os.cpp
@@ -56,12 +56,6 @@
 #	endif // BX_PLATFORM_ANDROID
 #endif // BX_PLATFORM_
 
-#if BX_CRT_MSVC
-#	include <direct.h> // _getcwd
-#else
-#	include <unistd.h> // getcwd
-#endif // BX_CRT_MSVC
-
 namespace bx
 {
 
@@ -287,20 +281,6 @@ namespace bx
 #endif // BX_COMPILER_
 	}
 
-	char* pwd(char* _buffer, uint32_t _size)
-	{
-#if BX_PLATFORM_PS4     \
- || BX_PLATFORM_XBOXONE \
- || BX_PLATFORM_WINRT
-		BX_UNUSED(_buffer, _size);
-		return NULL;
-#elif BX_CRT_MSVC
-		return ::_getcwd(_buffer, (int)_size);
-#else
-		return ::getcwd(_buffer, _size);
-#endif // BX_COMPILER_
-	}
-
 	void* exec(const char* const* _argv)
 	{
 #if BX_PLATFORM_LINUX \