Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8c3bd93 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Iee0932b5,I0d77c490 am: f8cd69af

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2025448

Change-Id: I098b877a54f1f29475863019f8c4dd9f27638d06
parents 9d6a710f f8cd69af
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@
// log all reference counting operations
#define PRINT_REFS 0

#if !defined(_WIN32) && !defined(__APPLE__)
#if defined(__linux__)
// CallStack is only supported on linux type platforms.
#define CALLSTACK_ENABLED 1
#else
+4 −12
Original line number Diff line number Diff line
@@ -34,15 +34,13 @@ typedef int32_t status_t;
 * All error codes are negative values.
 */

// Win32 #defines NO_ERROR as well.  It has the same value, so there's no
// real conflict, though it's a bit awkward.
#ifdef _WIN32
# undef NO_ERROR
#endif

enum {
    OK                = 0,    // Preferred constant for checking success.
#ifndef NO_ERROR
    // Win32 #defines NO_ERROR as well.  It has the same value, so there's no
    // real conflict, though it's a bit awkward.
    NO_ERROR          = OK,   // Deprecated synonym for `OK`. Prefer `OK` because it doesn't conflict with Windows.
#endif

    UNKNOWN_ERROR       = (-2147483647-1), // INT32_MIN value

@@ -76,10 +74,4 @@ enum {
// Human readable name of error
std::string statusToString(status_t status);

// Restore define; enumeration is in "android" namespace, so the value defined
// there won't work for Win32 code in a different namespace.
#ifdef _WIN32
# define NO_ERROR 0L
#endif

}  // namespace android