rusefi
/
jSerialComm
mirror of https://github.com/rusefi/jSerialComm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix deprecated MacOS typedef

This commit is contained in:
Will Hedgecock 2021-11-03 13:41:52 -05:00
parent 92c00b9eb0
commit fc17fd225a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/c/Posix/SerialPort_Posix.c
View File

@ -2,7 +2,7 @@
* SerialPort_Posix.c * SerialPort_Posix.c
* *
* Created on: Feb 25, 2012 * Created on: Feb 25, 2012
* Last Updated on: Nov 01, 2021 * Last Updated on: Nov 03, 2021
* Author: Will Hedgecock * Author: Will Hedgecock
* *
* Copyright (C) 2012-2021 Fazecast, Inc. * Copyright (C) 2012-2021 Fazecast, Inc.
@ -39,10 +39,14 @@
#elif defined(__sun__) #elif defined(__sun__)
#include <sys/filio.h> #include <sys/filio.h>
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <AvailabilityMacros.h>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <IOKit/IOKitLib.h> #include <IOKit/IOKitLib.h>
#include <IOKit/serial/IOSerialKeys.h> #include <IOKit/serial/IOSerialKeys.h>
#include <IOKit/serial/ioss.h> #include <IOKit/serial/ioss.h>
#if (MAC_OS_X_VERSION_MAX_ALLOWED < 120000) // Before macOS 12 Monterey
#define kIOMainPortDefault kIOMasterPortDefault
#endif
#endif #endif
#include "PosixHelperFunctions.h" #include "PosixHelperFunctions.h"
#include "../com_fazecast_jSerialComm_SerialPort.h" #include "../com_fazecast_jSerialComm_SerialPort.h"
@ -141,7 +145,7 @@ JNIEXPORT jobjectArray JNICALL Java_com_fazecast_jSerialComm_SerialPort_getCommP
char friendlyName[1024], comPortCu[1024], comPortTty[1024], portDescription[1024]; char friendlyName[1024], comPortCu[1024], comPortTty[1024], portDescription[1024];
// Enumerate serial ports on machine // Enumerate serial ports on machine
IOServiceGetMatchingServices(kIOMasterPortDefault, IOServiceMatching(kIOSerialBSDServiceValue), &serialPortIterator); IOServiceGetMatchingServices(kIOMainPortDefault, IOServiceMatching(kIOSerialBSDServiceValue), &serialPortIterator);
while ((serialPort = IOIteratorNext(serialPortIterator))) while ((serialPort = IOIteratorNext(serialPortIterator)))
{ {
++numValues; ++numValues;