From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Wed, 22 Jul 2009 23:05:47 +0000 (+0000)
Subject: missed the 'merge' conflict stuff
X-Git-Tag: BootManager-4.3-10~9
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=258517e4158dca4458119ae58cb8d6f2966ce5bd

missed the 'merge' conflict stuff
---

diff --git a/source/libc-opendir-hack.c b/source/libc-opendir-hack.c
index e7f6953..c95117d 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>
@@ -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