diff options
author | Marcus Meissner <marcus@jet.franken.de> | 2011-10-22 07:54:52 +0000 |
---|---|---|
committer | Marcus Meissner <marcus@jet.franken.de> | 2011-10-22 07:54:52 +0000 |
commit | 4c306bb1decdc0937e11d508f68d148c8fd80ba9 (patch) | |
tree | 2f6453dd18d9769cd9d7085cf52ffac7e15b97ef /libgphoto2_port/serial | |
parent | e797f3c117171dd49e56277930956229612102ba (diff) | |
download | libgphoto2-4c306bb1decdc0937e11d508f68d148c8fd80ba9.tar.gz |
removed baudboy.h usage
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@13756 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/serial')
-rw-r--r-- | libgphoto2_port/serial/unix.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libgphoto2_port/serial/unix.c b/libgphoto2_port/serial/unix.c index 7e0aebb57..77e9eccb9 100644 --- a/libgphoto2_port/serial/unix.c +++ b/libgphoto2_port/serial/unix.c @@ -67,9 +67,7 @@ # include <sgtty.h> #endif -#ifdef HAVE_BAUDBOY -# include <baudboy.h> -#elif defined(HAVE_TTYLOCK) +#ifdef HAVE_TTYLOCK # include <ttylock.h> #elif defined(HAVE_LOCKDEV) # include <lockdev.h> @@ -223,7 +221,7 @@ gp_port_serial_lock (GPPort *dev, const char *path) gp_log (GP_LOG_DEBUG, "gphoto2-port-serial", "Trying to lock '%s'...", path); -#if defined(HAVE_TTYLOCK) || defined(HAVE_BAUDBOY) +#if defined(HAVE_TTYLOCK) if (ttylock ((char*) path)) { if (dev) gp_port_set_error (dev, _("Could not lock device " @@ -265,7 +263,7 @@ static int gp_port_serial_unlock (GPPort *dev, const char *path) { -#if defined(HAVE_TTYLOCK) || defined(HAVE_BAUDBOY) +#if defined(HAVE_TTYLOCK) if (ttyunlock ((char*) path)) { if (dev) gp_port_set_error (dev, _("Device '%s' could not be " |