Skip to content

Commit ea59155

Browse files
committed
Fix the SerialPlugin build on linux (sqNullSerialPort.c must be excluded).
Make sure sqNullSerialPort.c will compile other than on Carbon Mac OS <blush>. Have gitci check incoming if asked to do so.
1 parent 977516c commit ea59155

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

platforms/Cross/plugins/SerialPlugin/sqNullSerialPort.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
* NOTES:
1212
* Feb 22nd, 2002, JMM enable 16 ports for serial, versus four, which was capped at 2?
1313
****************************************************************************/
14+
1415
#include "sq.h"
1516
#include "SerialPlugin.h"
16-
#include <Carbon/Carbon.h>
1717

1818
extern struct VirtualMachine *interpreterProxy;
1919

@@ -44,8 +44,7 @@ int serialPortShutdown() {
4444
EXPORT (int) serialPortCount(void) {
4545
/* Return the number of serial ports available on this machine */
4646
return false;
47-
48-
}
47+
}
4948

5049
int serialPortIsOpen(int portNum) {
5150
if ((portNum < 0) || (portNum >= MAX_PORTS)) return false;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
OBJS=SerialPlugin$o sqUnixSerial$o

scripts/gitci

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
# git add . stages new and modified, without deleted
88
# git add -u stages modified and deleted, without new
99

10-
echo "Have you checked incoming? Y/n \c"
10+
echo "Have you checked incoming? Y/n/check \c"
1111
read n
1212
case $n in
1313
n|N|no|nO|No|NO) exit 1;;
14+
c|C|ch*|C[hH]*) git incoming; exit 0;;
1415
esac
1516

1617
echo sanity checking generated files...

0 commit comments

Comments
 (0)