From 9fbebc5d55c7149e68d84d01a08736c0cb973740 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 16 Oct 2018 13:17:15 -0700 Subject: [PATCH] "utils/Errors.h": include for `int32_t`. No need for a Unix/Windows difference here. Bug: N/A Test: builds Change-Id: If7b27f939f9c13ef336d2015608f2a24db8cc96d --- libutils/include/utils/Errors.h | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/libutils/include/utils/Errors.h b/libutils/include/utils/Errors.h index 7aafe42d4..1e0367749 100644 --- a/libutils/include/utils/Errors.h +++ b/libutils/include/utils/Errors.h @@ -14,22 +14,19 @@ * limitations under the License. */ -#ifndef ANDROID_ERRORS_H -#define ANDROID_ERRORS_H +#pragma once -#include #include +#include +#include namespace android { -// use this type to return error codes -#ifdef _WIN32 -typedef int status_t; -#else -typedef int32_t status_t; -#endif - -/* the MS C runtime lacks a few error codes */ +/** + * The type used to return success/failure from frameworks APIs. + * See the anonymous enum below for valid values. + */ +typedef int32_t status_t; /* * Error codes. @@ -82,7 +79,3 @@ enum { #endif } // namespace android - -// --------------------------------------------------------------------------- - -#endif // ANDROID_ERRORS_H