summaryrefslogtreecommitdiff
path: root/libgphoto2_port/serial
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2008-05-06 09:31:25 +0000
committerMarcus Meissner <marcus@jet.franken.de>2008-05-06 09:31:25 +0000
commit7e432cebfebd78849d4783b2cf614b98f2514237 (patch)
treea0aacfd309a3b44b23e5c5d89e5813cb27938eb9 /libgphoto2_port/serial
parent1915a9ff4052850afc9ac542d42e15741fe3ea95 (diff)
downloadlibgphoto2-7e432cebfebd78849d4783b2cf614b98f2514237.tar.gz
O_NDELAY -> O_NONBLOCK
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@11128 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/serial')
-rw-r--r--libgphoto2_port/serial/unix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libgphoto2_port/serial/unix.c b/libgphoto2_port/serial/unix.c
index f54dba6da..1a7712a56 100644
--- a/libgphoto2_port/serial/unix.c
+++ b/libgphoto2_port/serial/unix.c
@@ -331,7 +331,7 @@ gp_port_library_list (GPPortInfoList *list)
continue;
/* Device locked. Try to open the device. */
- fd = open (path, O_RDONLY | O_NDELAY);
+ fd = open (path, O_RDONLY | O_NONBLOCK);
if (fd < 0) {
gp_port_serial_unlock (NULL, path);
continue;