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

Commit b066d981 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "libbase: add O_CLOEXEC to <android-base/file.h>." 

am: 2a846072

Change-Id: Iff4514265c1a6f25a3755f2fb43bbdf4a9204777
parents 36a11db3 2a846072

base/file.cpp

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#endif

#if defined(_WIN32)

#include <windows.h>

#define O_CLOEXEC O_NOINHERIT

#define O_NOFOLLOW 0

#endif

base/include/android-base/file.h

+7 −1
Original line number Diff line number Diff line
@@ -21,11 +21,17 @@ 
#include <string>



#if !defined(_WIN32) && !defined(O_BINARY)

/** Windows needs O_BINARY, but Unix never mangles line endings. */

#define O_BINARY 0

#endif



#if defined(_WIN32) && !defined(O_CLOEXEC)

/** Windows has O_CLOEXEC but calls it O_NOINHERIT for some reason. */

#define O_CLOEXEC O_NOINHERIT

#endif



#if defined(__APPLE__)

/* Mac OS has always had a 64-bit off_t, so it doesn't have off64_t. */

/** Mac OS has always had a 64-bit off_t, so it doesn't have off64_t. */

typedef off_t off64_t;

#endif

fastboot/fastboot.cpp

+0 −4
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ using android::base::Split; 
using android::base::Trim;

using android::base::unique_fd;



#if defined(_WIN32)

#define O_CLOEXEC O_NOINHERIT

#endif



static const char* serial = nullptr;



static bool g_long_listing = false;