diff options
| author | Shih-wei Liao <sliao@google.com> | 2012-02-23 15:41:54 -0800 |
|---|---|---|
| committer | Shih-wei Liao <sliao@google.com> | 2012-02-23 15:41:54 -0800 |
| commit | f2cb0bbbf4029093cfdbf9d3bd6e03989a6ef1b2 (patch) | |
| tree | 91baeba1f3c18ff0745e62c2b3c5cebd2a661b1d | |
| parent | c2bda1831d8307310f4f6ecbc91c1c53ce6fbf2f (diff) | |
| download | gdk-f2cb0bbbf4029093cfdbf9d3bd6e03989a6ef1b2.tar.gz | |
Workaround for Eclipse.
Change-Id: I4f92924332fcdf37583ac9f0db52ec94b1f1bab9
| -rw-r--r-- | headers/include/fcntl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/headers/include/fcntl.h b/headers/include/fcntl.h index a452db3..4e122aa 100644 --- a/headers/include/fcntl.h +++ b/headers/include/fcntl.h @@ -43,12 +43,11 @@ __BEGIN_DECLS #define O_CLOEXEC 02000000 #endif -<<<<<<< current extern int open(const char* path, int mode, ...); -======= +/* extern int open_portable(const char* path, int mode, ...); #define open open_portable ->>>>>>> patched +*/ extern int openat(int fd, const char* path, int mode, ...); extern int unlinkat(int dirfd, const char *pathname, int flags); extern int fcntl(int fd, int command, ...); |