revisions

examples/cl-repl/cpp/qt.cpp

@@ -6,7 +6,7 @@
 #include <QNetworkInterface>
 #include <QHostAddress>
 
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
   #include "usb/usb.h"
 #endif
 
@@ -341,7 +341,7 @@ QVariant QT::localIp() {
 
 // USB
 
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
 QVariant QT::connectUsb() {
   if (usb == nullptr) {
     usb = new USB();

examples/cl-repl/cpp/qt.h

@@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE
 
 extern "C" { LIB_EXPORT QObject* ini(); }
 
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
   class USB;
 #endif
 
@@ -111,7 +111,7 @@ public:
   Q_INVOKABLE QVariant localIp();
 
   // USB
-#ifdef Q_OS_LINUX
+#ifdef Q_OS_UNIX
   Q_INVOKABLE QVariant connectUsb  ();
   Q_INVOKABLE QVariant sendToUlisp (const QVariant&);
 

examples/cl-repl/cpp/qt.pro

@@ -12,10 +12,13 @@ MOC_DIR     = ./tmp/
 HEADERS += qt.h
 SOURCES += qt.cpp
 
-linux {
+unix {
   QT      += serialport
   HEADERS += usb/usb.h
   SOURCES += usb/usb.cpp
+}
+
+linux {
   LIBS    += -L../../../platforms/linux/lib
 }
 

examples/cl-repl/lisp/editor.lisp

@@ -655,8 +655,8 @@
 (defvar *ex-cmd* nil)
 
 (defun feed-top-level (text)
-  (if #+linux *ulisp-mode*         #-linux nil
-      #+linux (send-to-ulisp text) #-linux nil
+  (if #+unix *ulisp-mode*         #-unix nil
+      #+unix (send-to-ulisp text) #-unix nil
       (progn
         (when eval:*eval-thread*
           (if (mp:process-active-p eval:*eval-thread*)

examples/cl-repl/lisp/package.lisp

@@ -17,7 +17,7 @@
    #:set-font
    #:start
    ;; uLisp mode (e.g. Arduino)
-   #+linux #:*ulisp-mode*
-   #+linux #:send-to-ulisp
-   #+linux #:received-from-ulisp))
+   #+unix #:*ulisp-mode*
+   #+unix #:send-to-ulisp
+   #+unix #:received-from-ulisp))
 

examples/cl-repl/lisp/qt.lisp

@@ -31,8 +31,8 @@
    #:text
    #:text-document
    ;; ulisp (e.g. Arduino)
-   #+linux #:connect-usb
-   #+linux #:send-to-ulisp))
+   #+unix #:connect-usb
+   #+unix #:send-to-ulisp))
 
 (in-package :qt)