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

Commit 2a7b8633 authored by Christopher Wiley's avatar Christopher Wiley
Browse files

Don't include android-base/macros.h from android-base/unique_fd.h

This prevents a ton of macro collisions when libfoo includes libbinder
includes unique_fd.h.

Bug: 27804373
Change-Id: Ide834afb1052b32e86fad3fcba10cff3dafeb899
parent 603df0e8
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@

#include <unistd.h>

#include <android-base/macros.h>
// DO NOT INCLUDE OTHER LIBBASE HEADERS!
// This file gets used in libbinder, and libbinder is used everywhere.
// Including other headers from libbase frequently results in inclusion of
// android-base/macros.h, which causes macro collisions.

// Container for a file descriptor that automatically closes the descriptor as
// it goes out of scope.
@@ -75,7 +78,8 @@ class unique_fd final {
 private:
  int value_;

  DISALLOW_COPY_AND_ASSIGN(unique_fd);
  unique_fd(const unique_fd&);
  void operator=(const unique_fd&);
};

}  // namespace base