X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fserial.c;h=80b6f22cd2a37e2be1edae8e1344956343397863;hb=357285a944b514bb4498f16b6318829516e33e1a;hp=b98d3c95e82f76d5bb573ef3bc1a58e98ab2b1f8;hpb=c548332c21acc2588114214b38eaa3237fc3f8b3;p=libsigrok.git diff --git a/hardware/common/serial.c b/hardware/common/serial.c index b98d3c95..80b6f22c 100644 --- a/hardware/common/serial.c +++ b/hardware/common/serial.c @@ -30,12 +30,12 @@ #endif #include #include -#include -#include +#include "sigrok.h" +#include "sigrok-internal.h" // FIXME: Must be moved, or rather passed as function argument. #ifdef _WIN32 -HANDLE hdl; +static HANDLE hdl; #endif const char *serial_port_glob[] = { @@ -248,9 +248,11 @@ int serial_set_params(int fd, int speed, int bits, int parity, int stopbits, case 115200: baud = B115200; break; +#ifndef __APPLE__ case 460800: baud = B460800; break; +#endif default: return SR_ERR; }