From 084cdcffae7d4734d0fe9927eca8a76d83f5f0e2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Kochma=C5=84ski?= <dkochmanski@turtle-solutions.eu>
Date: Tue, 2 Jun 2015 11:15:21 +0200
Subject: [PATCH] compatibility: Fix ECL loading issues
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Kochmański <dkochmanski@turtle-solutions.eu>
---
 ChangeLog             | 6 +++++-
 clsql.asd             | 2 +-
 sql/db-interface.lisp | 4 ++--
 sql/package.lisp      | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 947d2eb..63a2b16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-02 Daniel Kochmański <dkochmanski@turtle-solutions.eu>
+	* clsql.asd, sql/package.lisp: Add ECL compatibility fixes
+	* sql/db-interface.lisp: Fix declaration typo
+
 2015-04-06 Russ Tyndall <russ@acceleration.net>
 	* sql/operations, sql/expressions: add postgresql E-string
 	operator / expression.  Needed for correct regex handling
@@ -9,7 +13,7 @@
 	sql-value-conversion-error
 	* default read-sql-value for list
 	* tests for sql-value-conversion-errors and list
-	
+
 2015-03-18 Russ Tyndall <russ@acceleration.net>
 	* {uffi,db-mysql}/Makefile: remove -pie build hardening for
 	which caused load issues for Linux Mint
diff --git a/clsql.asd b/clsql.asd
index 5d9adf2..74afd3b 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -101,7 +101,7 @@ oriented interface."
   (operate 'test-op 'clsql-tests :force t))
 
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
-  (let* ((init-var (uffi:getenv "CLSQLINIT"))
+  (let* ((init-var (uffi::getenv "CLSQLINIT"))
          (init-file (or (when init-var (probe-file init-var))
                         (probe-file
                          (concatenate 'string
diff --git a/sql/db-interface.lisp b/sql/db-interface.lisp
index 5cdb719..3454a84 100644
--- a/sql/db-interface.lisp
+++ b/sql/db-interface.lisp
@@ -380,8 +380,8 @@ of TYPE_NAME (keyword) PRECISION SCALE NULLABLE.")
 
 (defgeneric db-type-has-auto-increment? (db-type)
   (:method (db-type)
-    (declare (ignore db-type)
-	     nil))
+    (declare (ignore db-type))
+	     nil)
   (:documentation "NIL [default] if database-type supports auto-incrementing columns."))
 
 ;;; Large objects support (Marc Battyani)
diff --git a/sql/package.lisp b/sql/package.lisp
index 470be84..8915b06 100644
--- a/sql/package.lisp
+++ b/sql/package.lisp
@@ -37,6 +37,7 @@
           #+clsql-cmucl-mop #:mop
           #+allegro #:mop
           #+clisp #:clos
+          #+ecl #:mop
           #+lispworks #:clos
           #+scl #:clos
           #+openmcl #:openmcl-mop)
-- 
2.34.1