ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Elliott Hughes 2018-10-25 15:21:06 +00:00 • committed by Gerrit Code Review
commit 2a8460721c
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
base/file.cpp
View file

@ -38,7 +38,6 @@
#endif
#if defined(_WIN32)
#include <windows.h>
#define O_CLOEXEC O_NOINHERIT
#define O_NOFOLLOW 0
#endif

8
base/include/android-base/file.h
View file

@ -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

4
fastboot/fastboot.cpp
View file

@ -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;