git://git.onelab.eu
/
bootmanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
05fcdf2
)
missed the 'merge' conflict stuff
author
Stephen Soltesz
<soltesz@cs.princeton.edu>
Wed, 22 Jul 2009 23:05:47 +0000
(23:05 +0000)
committer
Stephen Soltesz
<soltesz@cs.princeton.edu>
Wed, 22 Jul 2009 23:05:47 +0000
(23:05 +0000)
source/libc-opendir-hack.c
patch
|
blob
|
history
diff --git
a/source/libc-opendir-hack.c
b/source/libc-opendir-hack.c
index
e7f6953
..
c95117d
100644
(file)
--- a/
source/libc-opendir-hack.c
+++ b/
source/libc-opendir-hack.c
@@
-1,4
+1,3
@@
-<<<<<<< .working
#define _GNU_SOURCE 1
#include <stdio.h>
@@
-137,21
+136,3
@@
static void _init()
INIT(open)
INIT(fopen)
}
-=======
-#define _GNU_SOURCE 1
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <dirent.h>
-
-#define NAME "O_CLOEXEC-vs-O_ATOMICLOOKUP"
-
-DIR *opendir(const char *name)
-{
- int fd = open(name, O_RDONLY|O_NDELAY|O_DIRECTORY|O_LARGEFILE);
- if (fd == -1)
- return NULL;
- return fdopendir(fd);
-}
->>>>>>> .merge-right.r9766