libbase: add O_CLOEXEC to <android-base/file.h>.
We already expose O_BINARY, and O_CLOEXEC seems equally legitimate. Bug: N/A Test: builds Change-Id: I7f07e1bb2a5d6b5c5f293783c39ceab148fabefb
This commit is contained in:
parent
48a0e186a7
commit
32df7ee5c8
3 changed files with 7 additions and 6 deletions
|
|
@ -38,7 +38,6 @@
|
|||
#endif
|
||||
#if defined(_WIN32)
|
||||
#include <windows.h>
|
||||
#define O_CLOEXEC O_NOINHERIT
|
||||
#define O_NOFOLLOW 0
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue