From 03c5dafac095927695268ee6217dc2920282d2ba Mon Sep 17 00:00:00 2001
From: Raymond Wiker <rwiker@gmail.com>
Date: Wed, 7 Jun 2017 21:40:20 +0200
Subject: [PATCH] Updated to build with Lispworks 7

---
 src/nox/core-constants.lisp | 11 ++++++-----
 src/nox/xml-util.lisp       | 26 +++++++++++++++++---------
 src/platform.lisp           |  2 +-
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/nox/core-constants.lisp b/src/nox/core-constants.lisp
index 39c46e2..dec3141 100644
--- a/src/nox/core-constants.lisp
+++ b/src/nox/core-constants.lisp
@@ -102,11 +102,12 @@
   (defequal -owl-uri-  "http://www.w3.org/2002/07/owl#")
   (defequal -daml-uri- "http://www.daml.org/2000/12/daml+oil#"))
 
-(defmacro rdf-uri (string)  `(concatenate 'string -rdf-uri- ,string))
-(defmacro rdfs-uri (string) `(concatenate 'string -rdfs-uri- ,string))
-(defmacro xsd-uri (string)  `(concatenate 'string -xsd-uri- ,string))
-(defmacro owl-uri (string)  `(concatenate 'string -owl-uri- ,string))
-(defmacro daml-uri (string) `(concatenate 'string -daml-uri- ,string))
+(eval-when (:compile-toplevel :load-toplevel)
+  (defmacro rdf-uri (string)  `(concatenate 'string -rdf-uri- ,string))
+  (defmacro rdfs-uri (string) `(concatenate 'string -rdfs-uri- ,string))
+  (defmacro xsd-uri (string)  `(concatenate 'string -xsd-uri- ,string))
+  (defmacro owl-uri (string)  `(concatenate 'string -owl-uri- ,string))
+  (defmacro daml-uri (string) `(concatenate 'string -daml-uri- ,string)))
 
 (defequal -alternate-rdf-uri-
   #."http://www.w3.org/TR/REC-rdf-syntax/")
diff --git a/src/nox/xml-util.lisp b/src/nox/xml-util.lisp
index 8ca7448..7d323a9 100644
--- a/src/nox/xml-util.lisp
+++ b/src/nox/xml-util.lisp
@@ -207,14 +207,22 @@
   (warn "No working WITHOUT-INTERRUPTS in this implementation")
   `(progn ,@body))
 
-#-:digitool
+#-(or :digitool :lispworks)
 (defmacro atomic-push (thing place)
   `(without-interrupts (push ,thing ,place)))
 
-#-:digitool
+#+:lispworks
+(defmacro atomic-push (thing place)
+  `(sys:atomic-push ,thing ,place))
+
+#-(or :digitool :lispworks)
 (defmacro atomic-pop (place)
   `(without-interrupts (pop ,place)))
 
+#+:lispworks
+(defmacro atomic-pop (place)
+  `(sys:atomic-pop ,place))
+
 (defun allocate-resource-from-pool (pool &rest args)
   #+:digitool
   (declare (ignore args))
@@ -381,13 +389,13 @@
            (read-char stream t nil t) ; skip #\>
            (return (concatenate 'string (nreverse chars)))))))
 
-
-(defmacro whitespace-char-p (char)
-  (with-temps (c)
-    `(let ((,c ,char))
-       ;; let's assume this works for now :-)
-       (or (char= ,c #\Space)
-           (not (graphic-char-p ,c))))))
+(eval-when (:compile-toplevel :load-toplevel)
+  (defmacro whitespace-char-p (char)
+    (with-temps (c)
+      `(let ((,c ,char))
+         ;; let's assume this works for now :-)
+         (or (char= ,c #\Space)
+             (not (graphic-char-p ,c)))))))
 
 
 (defequal -whitespace-chars-
diff --git a/src/platform.lisp b/src/platform.lisp
index 9bc1ef4..df076b3 100644
--- a/src/platform.lisp
+++ b/src/platform.lisp
@@ -123,7 +123,7 @@
 ;;;   LOCKS
 ;;;
 
-#-(and :digitool :CCL-5.2)              ; already defined
+#-(or lispworks (and :digitool :CCL-5.2))              ; already defined
 (defmacro with-lock ((lock &rest args) &body body)
   #+(or :digitool :clozure)  `(with-lock-grabbed (,lock ,@args) ,@body)
   #+:excl `(mp:with-process-lock (,lock ,@args) ,@body)