diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-09 16:35:20 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-05-09 16:35:20 +0000 |
| commit | 2c293ed595845dd5b135b6f7f6efe43deb1eb47f (patch) | |
| tree | 4619ed3cc2e8df2054a88bd90bd3742c92de9df2 | |
| parent | e1790ae94eff4eff33b0ffe377e235cdbb04b731 (diff) | |
| parent | 89a574cb18a823d62778b174bf0e6924f387d7a8 (diff) | |
| download | aemu-emu-35-1-release.tar.gz | |
Snap for 11819808 from 89a574cb18a823d62778b174bf0e6924f387d7a8 to emu-35-1-releaseemu-35-1-release
Change-Id: Ic2e6ba14db01c728bb3e205f5a98b92fa6b61d61
| -rw-r--r-- | base/FileUtils.cpp | 2 | ||||
| -rw-r--r-- | base/StringUtils.cpp | 2 | ||||
| -rw-r--r-- | base/System.cpp | 4 | ||||
| -rw-r--r-- | base/include/aemu/base/files/ScopedFd.h | 2 | ||||
| -rw-r--r-- | base/include/aemu/base/files/TarStream.h | 2 | ||||
| -rw-r--r-- | base/include/aemu/base/misc/IpcPipe.h | 2 |
6 files changed, 7 insertions, 7 deletions
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 @@ static const TickCountImpl kTickCount; 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> |