diff options
author | 2021-08-16 13:00:28 -0700 | |
---|---|---|
committer | 2021-08-17 15:01:14 -0700 | |
commit | faa5e27652dd889c95e2405bbeec8483ff7497c3 (patch) | |
tree | 9960a631527a5db12ce4903bc02d40906e06195d /libs/androidfw/PosixUtils.cpp | |
parent | e7449820a486c08dc487c96c7d961533566500bf (diff) |
Rename ProcResult stdout and stderr fields
stdout and stderr are macros in musl, which causes build failures
when they are used as field names. Rename the fields to stdout_str
and stderr_str.
Test: builds
Change-Id: I04770d2d6e82ca8393308ab12a304838a80f0ae5
Diffstat (limited to 'libs/androidfw/PosixUtils.cpp')
-rw-r--r-- | libs/androidfw/PosixUtils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/androidfw/PosixUtils.cpp b/libs/androidfw/PosixUtils.cpp index 4ec525a01da5..026912883a73 100644 --- a/libs/androidfw/PosixUtils.cpp +++ b/libs/androidfw/PosixUtils.cpp @@ -114,10 +114,10 @@ std::unique_ptr<ProcResult> ExecuteBinary(const std::vector<std::string>& argv) std::unique_ptr<ProcResult> result(new ProcResult()); result->status = status; const auto out = ReadFile(stdout[0]); - result->stdout = out ? *out : ""; + result->stdout_str = out ? *out : ""; close(stdout[0]); const auto err = ReadFile(stderr[0]); - result->stderr = err ? *err : ""; + result->stderr_str = err ? *err : ""; close(stderr[0]); return result; } |