From 1e039755d04a14bfbe1d3f3d8493700f5be9fd8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Sun, 8 Jan 2017 15:26:44 -0800
Subject: [PATCH] Cleanup.

---
 include/bx/os.h      |  3 ++
 include/bx/process.h | 80 --------------------------------------------
 src/os.cpp           | 59 ++++++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 80 deletions(-)
 delete mode 100644 include/bx/process.h

diff --git a/include/bx/os.h b/include/bx/os.h
index 197e128..d263975 100644
--- a/include/bx/os.h
+++ b/include/bx/os.h
@@ -76,6 +76,9 @@ namespace bx
 	///
 	bool stat(const char* _filePath, FileInfo& _fileInfo);
 
+	///
+	void* exec(const char* const* _argv);
+
 } // namespace bx
 
 #endif // BX_OS_H_HEADER_GUARD
diff --git a/include/bx/process.h b/include/bx/process.h
deleted file mode 100644
index 03c8f12..0000000
--- a/include/bx/process.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2010-2017 Branimir Karadzic. All rights reserved.
- * License: https://github.com/bkaradzic/bx#license-bsd-2-clause
- */
-
-#ifndef BX_PROCESS_H_HEADER_GUARD
-#define BX_PROCESS_H_HEADER_GUARD
-
-#include "string.h"
-#include "uint32_t.h"
-
-#if BX_PLATFORM_LINUX || BX_PLATFORM_HURD
-#	include <unistd.h>
-#endif // BX_PLATFORM_LINUX || BX_PLATFORM_HURD
-
-namespace bx
-{
-	///
-	inline void* exec(const char* const* _argv)
-	{
-#if BX_PLATFORM_LINUX || BX_PLATFORM_HURD
-		pid_t pid = fork();
-
-		if (0 == pid)
-		{
-			int result = execvp(_argv[0], const_cast<char *const*>(&_argv[1]) );
-			BX_UNUSED(result);
-			return NULL;
-		}
-
-		return (void*)uintptr_t(pid);
-#elif BX_PLATFORM_WINDOWS
-		STARTUPINFO si;
-		memset(&si, 0, sizeof(STARTUPINFO) );
-		si.cb = sizeof(STARTUPINFO);
-
-		PROCESS_INFORMATION pi;
-		memset(&pi, 0, sizeof(PROCESS_INFORMATION) );
-
-		int32_t total = 0;
-		for (uint32_t ii = 0; NULL != _argv[ii]; ++ii)
-		{
-			total += (int32_t)strlen(_argv[ii]) + 1;
-		}
-
-		char* temp = (char*)alloca(total);
-		int32_t len = 0;
-		for(uint32_t ii = 0; NULL != _argv[ii]; ++ii)
-		{
-			len += snprintf(&temp[len], bx::uint32_imax(0, total-len)
-						, "%s "
-						, _argv[ii]
-						);
-		}
-
-		bool ok = CreateProcessA(_argv[0]
-					, temp
-					, NULL
-					, NULL
-					, false
-					, 0
-					, NULL
-					, NULL
-					, &si
-					, &pi
-					);
-		if (ok)
-		{
-			return pi.hProcess;
-		}
-
-		return NULL;
-#else
-		return NULL;
-#endif // BX_PLATFORM_LINUX || BX_PLATFORM_HURD
-	}
-
-} // namespace bx
-
-#endif // BX_PROCESS_H_HEADER_GUARD
diff --git a/src/os.cpp b/src/os.cpp
index 32c3ff2..0739ccc 100644
--- a/src/os.cpp
+++ b/src/os.cpp
@@ -378,4 +378,63 @@ namespace bx
 		return true;
 	}
 
+	void* exec(const char* const* _argv)
+	{
+#if BX_PLATFORM_LINUX || BX_PLATFORM_HURD
+		pid_t pid = fork();
+
+		if (0 == pid)
+		{
+			int result = execvp(_argv[0], const_cast<char *const*>(&_argv[1]) );
+			BX_UNUSED(result);
+			return NULL;
+		}
+
+		return (void*)uintptr_t(pid);
+#elif BX_PLATFORM_WINDOWS
+		STARTUPINFO si;
+		memset(&si, 0, sizeof(STARTUPINFO) );
+		si.cb = sizeof(STARTUPINFO);
+
+		PROCESS_INFORMATION pi;
+		memset(&pi, 0, sizeof(PROCESS_INFORMATION) );
+
+		int32_t total = 0;
+		for (uint32_t ii = 0; NULL != _argv[ii]; ++ii)
+		{
+			total += (int32_t)strlen(_argv[ii]) + 1;
+		}
+
+		char* temp = (char*)alloca(total);
+		int32_t len = 0;
+		for(uint32_t ii = 0; NULL != _argv[ii]; ++ii)
+		{
+			len += snprintf(&temp[len], bx::uint32_imax(0, total-len)
+						, "%s "
+						, _argv[ii]
+						);
+		}
+
+		bool ok = CreateProcessA(_argv[0]
+					, temp
+					, NULL
+					, NULL
+					, false
+					, 0
+					, NULL
+					, NULL
+					, &si
+					, &pi
+					);
+		if (ok)
+		{
+			return pi.hProcess;
+		}
+
+		return NULL;
+#else
+		return NULL;
+#endif // BX_PLATFORM_LINUX || BX_PLATFORM_HURD
+	}
+
 } // namespace bx