From: Russ Tyndall <russ@acceleration.net>
Date: Tue, 10 Jun 2014 15:26:27 +0000 (-0400)
Subject: Merge branch 'master' of git.acceleration.net:/var/git/clsql
X-Git-Tag: v6.6.0~9
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=578241e238851ac58c6483b3986e471b7262ccf2;hp=340bfa03e48e1d44406b15bf3177add0933f2429

Merge branch 'master' of git.acceleration.net:/var/git/clsql
---

diff --git a/clsql.asd b/clsql.asd
index d469b95..5d9adf2 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -23,6 +23,9 @@
 (eval-when (:compile-toplevel :load-toplevel :execute)
   #+:clsql-cffi
   (unless (find-package 'cffi-uffi-compat)
+    #+quicklisp
+    (ql:quickload :cffi-uffi-compat)
+    #-quicklisp
     (asdf:operate 'asdf:load-op 'cffi-uffi-compat))
   #-:clsql-cffi
   (unless (find-package 'uffi)