Make (declare (values ...)) for rpc methods opt-in, rather than opt-out

So far only CCL appears to consistently handle this.

diff --git a/define-proto.lisp b/define-proto.lisp
index 3e7e83cef4231a66faad3535d6912597568937fc..163cd8e6e66312b74aaeae4d254423c1bd8183b1 100644 (file)
--- a/define-proto.lisp
+++ b/define-proto.lisp
@@ -794,7 +794,8 @@
               ;; response as an application object.
               (collect-form `(defgeneric ,client-fn (,vchannel ,vrequest &key ,vcallback)
                                ,@(and documentation `((:documentation ,documentation)))
-                               #-sbcl (declare (values ,output-type))
+                               #+(or ccl)
+                               (declare (values ,output-type))
                                (:method (,vchannel (,vrequest ,input-type) &key ,vcallback)
                                  (declare (ignorable ,vchannel ,vcallback))
                                  (let ((call (and *rpc-package* *rpc-call-function*)))
@@ -815,7 +816,8 @@
               ;; The RPC code provides the channel classes and does (de)serialization, etc
               (collect-form `(defgeneric ,server-fn (,vchannel ,vrequest)
                                ,@(and documentation `((:documentation ,documentation)))
-                               #-sbcl (declare (values ,output-type))))))))
+                               #+(or ccl)
+                               (declare (values ,output-type))))))))
       `(progn
          define-service
          ,service