am 61f02065: am cf7a4a4f: Merge "Revert "Add C linkage for __open_2 and __openat_2.""

* commit '61f020650466751501fce0326e654135b88c9f99':
  Revert "Add C linkage for __open_2 and __openat_2."
This commit is contained in:
Elliott Hughes 2013-12-19 20:13:00 +00:00 committed by Android Git Automerger
commit 01e8d48761

View File

@ -50,7 +50,7 @@ int open(const char* pathname, int flags, ...) {
return __openat(AT_FDCWD, pathname, flags, mode);
}
extern "C" int __open_2(const char* pathname, int flags) {
int __open_2(const char* pathname, int flags) {
if (__predict_false(flags & O_CREAT)) {
__fortify_chk_fail("open(O_CREAT): called without specifying a mode", 0);
}
@ -75,7 +75,7 @@ int openat(int fd, const char *pathname, int flags, ...) {
return __openat(fd, pathname, flags, mode);
}
extern "C" int __openat_2(int fd, const char* pathname, int flags) {
int __openat_2(int fd, const char* pathname, int flags) {
if (flags & O_CREAT) {
__fortify_chk_fail("openat(O_CREAT): called without specifying a mode", 0);
}