xf86-video-intel: src/intel_device.c
Chris Wilson
ickle at kemper.freedesktop.org
Thu Jun 27 13:10:12 PDT 2013
src/intel_device.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 9b3e5c211451ac07bd96cd997ac714bcbe1809b0
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Thu Jun 27 21:08:05 2013 +0100
intel: #ifdef O_CLOEXEC for compilation on squeeze
If the system doesn't support O_CLOEXEC, then we simply can't use it.
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
diff --git a/src/intel_device.c b/src/intel_device.c
index 1880a9b..e1e79a0 100644
--- a/src/intel_device.c
+++ b/src/intel_device.c
@@ -85,8 +85,15 @@ static int __intel_open_device(const struct pci_device *pci, const char *path)
}
fd = drmOpen(NULL, id);
- } else
- fd = open(path, O_RDWR | O_CLOEXEC);
+ } else {
+ fd = open(path, O_RDWR |
+#ifdef O_CLOEXEC
+ O_CLOEXEC |
+#endif
+ 0);
+ if (fd == -1)
+ fd = open(path, O_RDWR);
+ }
return fd;
}
More information about the xorg-commit
mailing list