X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=linux.c;h=1531f9276a7ae70cd9965e181b23623d7f4ca831;hb=c37c9f348d015f1fcec1d8597458418bf1300565;hp=f9b2ec69c888ed96ded15ad177126116ff97af20;hpb=46d8b0a039965cf68fb27a3b88b3c23a1e34d912;p=libserialport.git diff --git a/linux.c b/linux.c index f9b2ec6..1531f92 100644 --- a/linux.c +++ b/linux.c @@ -1,6 +1,7 @@ /* * This file is part of the libserialport project. * + * Copyright (C) 2013 Martin Ling * Copyright (C) 2014 Aurelien Jacobs * * This program is free software: you can redistribute it and/or modify @@ -177,7 +178,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list) { char name[PATH_MAX], target[PATH_MAX]; struct dirent entry, *result; -#ifdef HAVE_SERIAL_STRUCT +#ifdef HAVE_STRUCT_SERIAL_STRUCT struct serial_struct serial_info; int ioctl_result; #endif @@ -217,11 +218,11 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list) DEBUG("Open failed, skipping"); continue; } -#ifdef HAVE_SERIAL_STRUCT +#ifdef HAVE_STRUCT_SERIAL_STRUCT ioctl_result = ioctl(fd, TIOCGSERIAL, &serial_info); #endif close(fd); -#ifdef HAVE_SERIAL_STRUCT +#ifdef HAVE_STRUCT_SERIAL_STRUCT if (ioctl_result != 0) { DEBUG("ioctl failed, skipping"); continue;