Fix building on OSX and Linux.

[libserialport.git] / serialport.c

diff --git a/serialport.c b/serialport.c
index 20a4afba25bf6b64e99269323d7b85b12debb442..e8de069fb9d1d34d344bf943f86b70aba016dc70 100644 (file)
--- a/serialport.c
+++ b/serialport.c
@@ -34,8 +34,9 @@
 #include <sys/ioctl.h>
 #endif
 #ifdef __APPLE__
-#include <IOKitLib.h>
-#include <serial/IOSerialKeys.h>
+#include <IOKit/IOKitLib.h>
+#include <IOKit/serial/IOSerialKeys.h>
+#include <sys/syslimits.h>
 #endif
 #ifdef __linux__
 #include "libudev.h"
@@ -148,7 +149,7 @@ out_close:
        if (!(list = sp_list_new()))
                goto out;
 
-       while (port = IOIteratorNext(iter)) {
+       while ((port = IOIteratorNext(iter))) {
                cf_path = IORegistryEntryCreateCFProperty(port,
                                CFSTR(kIOCalloutDeviceKey), kCFAllocatorDefault, 0);
                if (cf_path) {