am 1732a8da: am 417c2061: am 922e2af4: Merge "O_CLOEXEC is always defined for arm, mips, x86, and x86_64."

* commit '1732a8da03af9261d7863d7d8a65dd654986d638':
  O_CLOEXEC is always defined for arm, mips, x86, and x86_64.
This commit is contained in:
Elliott Hughes 2013-10-17 14:40:34 -07:00 committed by Android Git Automerger
commit 4e92ee5a7b

View File

@ -25,6 +25,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef _FCNTL_H #ifndef _FCNTL_H
#define _FCNTL_H #define _FCNTL_H
@ -39,10 +40,6 @@ __BEGIN_DECLS
#define O_ASYNC FASYNC #define O_ASYNC FASYNC
#endif #endif
#ifndef O_CLOEXEC
#define O_CLOEXEC 02000000
#endif
extern int open(const char* path, int mode, ...); extern int open(const char* path, int mode, ...);
extern int openat(int fd, const char* path, int mode, ...); extern int openat(int fd, const char* path, int mode, ...);
extern int unlinkat(int dirfd, const char *pathname, int flags); extern int unlinkat(int dirfd, const char *pathname, int flags);