X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2Flibc-opendir-hack.c;h=182a59de2156c661d06dbcbf977fd71829fb2964;hb=15279cd1de87015b86291f9216e4f6aeca027301;hp=e7f6953c40210eee4ad668c72dd487d1e7d2183f;hpb=05fcdf2237fe6100cc31828ca206d42b24e8ae5a;p=bootmanager.git

diff --git a/source/libc-opendir-hack.c b/source/libc-opendir-hack.c
index e7f6953..182a59d 100644
--- a/source/libc-opendir-hack.c
+++ b/source/libc-opendir-hack.c
@@ -1,4 +1,3 @@
-<<<<<<< .working
 #define _GNU_SOURCE 1
 
 #include <stdio.h>
@@ -10,6 +9,7 @@
 #include <glob.h>
 #include <stdarg.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #define INIT(x)	real_ ## x = dlsym(RTLD_NEXT, #x); \
 		if (!real_ ## x) { \
@@ -137,21 +137,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