Windows: Fix msvc header dependency
This updates the msvc-posix.h include to use the one that actually lives
in this package.
This makes sure you do not need an external dependency when including
these headers on windows.
Change-Id: I8a4265371e8068b10a0e197f56fba9490071849d
GitOrigin-RevId: 89a574cb18a823d62778b174bf0e6924f387d7a8
diff --git a/base/FileUtils.cpp b/base/FileUtils.cpp
index a29415f..393e68e 100644
--- a/base/FileUtils.cpp
+++ b/base/FileUtils.cpp
@@ -21,7 +21,7 @@
#include <sys/types.h>
#include "aemu/base/msvc.h"
#ifdef _MSC_VER
-//#include "msvc-posix.h"
+//#include "aemu/base/msvc.h"
#else
#include <unistd.h>
#endif
diff --git a/base/StringUtils.cpp b/base/StringUtils.cpp
index 3f0d647..78b893e 100644
--- a/base/StringUtils.cpp
+++ b/base/StringUtils.cpp
@@ -18,7 +18,7 @@
#include <string.h>
#ifdef _MSC_VER
-#include "msvc-posix.h"
+#include "aemu/base/msvc.h"
#endif
#include <algorithm>
diff --git a/base/System.cpp b/base/System.cpp
index 9883f3f..7cf64d8 100644
--- a/base/System.cpp
+++ b/base/System.cpp
@@ -39,7 +39,7 @@
#endif // __APPLE__
#ifdef _MSC_VER
-// #include "msvc-posix.h"
+// #include "aemu/base/msvc.h"
// #include <dirent.h>
#else
#include <time.h>
@@ -145,7 +145,7 @@
namespace android {
namespace base {
-std::string getEnvironmentVariable(const std::string& key) {
+std::string getEnvironmentVariable(const std::string& key) {
#ifdef _WIN32
Win32UnicodeString varname_unicode(key);
const wchar_t* value = _wgetenv(varname_unicode.c_str());
diff --git a/base/include/aemu/base/files/ScopedFd.h b/base/include/aemu/base/files/ScopedFd.h
index 0859acd..1b042af 100644
--- a/base/include/aemu/base/files/ScopedFd.h
+++ b/base/include/aemu/base/files/ScopedFd.h
@@ -18,7 +18,7 @@
#include <errno.h>
#ifdef _MSC_VER
-#include "msvc-posix.h"
+#include "aemu/base/msvc.h"
#else
#include <unistd.h>
#endif
diff --git a/base/include/aemu/base/files/TarStream.h b/base/include/aemu/base/files/TarStream.h
index 4abe1c3..fe9c0c6 100644
--- a/base/include/aemu/base/files/TarStream.h
+++ b/base/include/aemu/base/files/TarStream.h
@@ -20,7 +20,7 @@
#include "android/utils/file_io.h" // for android_mkdir, android_stat
#ifdef _MSC_VER
-#include "msvc-posix.h"
+#include "aemu/base/msvc.h"
using uid_t = uint32_t;
using gid_t = uint32_t;
#endif
diff --git a/base/include/aemu/base/misc/IpcPipe.h b/base/include/aemu/base/misc/IpcPipe.h
index 84ad4dd..6fd0c11 100644
--- a/base/include/aemu/base/misc/IpcPipe.h
+++ b/base/include/aemu/base/misc/IpcPipe.h
@@ -15,7 +15,7 @@
#pragma once
#ifdef _MSC_VER
-#include "msvc-posix.h"
+#include "aemu/base/msvc.h"
#endif
#include <sys/types.h>
