X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=db-postgresql-socket%2Fpostgresql-socket-api.lisp;h=a6cc666c0805358bb098137f79785b3e8f71ecee;hb=d5e6e9e5fda4a11403c04c86d3a7ab0d0b6aa3ef;hp=fe31cedd1424c9b183d59f2510d7275f1ca659dc;hpb=8b5250e14e3280bdc4641c3b35a8dc68ca4dbde7;p=clsql.git

diff --git a/db-postgresql-socket/postgresql-socket-api.lisp b/db-postgresql-socket/postgresql-socket-api.lisp
index fe31ced..a6cc666 100644
--- a/db-postgresql-socket/postgresql-socket-api.lisp
+++ b/db-postgresql-socket/postgresql-socket-api.lisp
@@ -27,13 +27,13 @@
      (:float4 700)
      (:float8 701)))
 
-(defmethod clsql-base-sys:database-type-library-loaded ((database-type
+(defmethod clsql-sys:database-type-library-loaded ((database-type
 					  (eql :postgresql-socket)))
   "T if foreign library was able to be loaded successfully. Always true for
 socket interface"
   t)
 
-(defmethod clsql-base-sys:database-type-load-foreign ((database-type (eql :postgresql-socket)))
+(defmethod clsql-sys:database-type-load-foreign ((database-type (eql :postgresql-socket)))
   t)
 
 
@@ -214,19 +214,20 @@ socket interface"
 ;;; Support for encrypted password transmission
 
 #-scl
-(eval-when (compile eval load)
+(eval-when (:compile-toplevel :load-toplevel :execute)
   (defvar *crypt-library-loaded* nil)
 
   (unless *crypt-library-loaded*
     (uffi:load-foreign-library 
      (uffi:find-foreign-library "libcrypt"
-			   '("/usr/lib/" "/usr/local/lib/" "/lib/"))
+			   '(#+64bit "/usr/lib64/"
+			     "/usr/lib/" "/usr/local/lib/" "/lib/"))
      :supporting-libraries '("c"))
     (setq *crypt-library-loaded* t)))
 
 (in-package :postgresql-socket)
 
-(uffi:def-function "crypt" 
+(uffi:def-function ("crypt" crypt)
     ((key :cstring)
      (salt :cstring))
   :returning :cstring)
@@ -560,8 +561,7 @@ connection, if it is still open."
   (force-output (postgresql-connection-socket connection)))
 
 (defun wait-for-query-results (connection)
-  (asse
-rt (postgresql-connection-open-p connection))
+  (assert (postgresql-connection-open-p connection))
   (let ((socket (postgresql-connection-socket connection))
 	(cursor-name nil)
 	(error nil))
@@ -601,8 +601,9 @@ rt (postgresql-connection-open-p connection))
 				   :connection connection :message message))))
 	  (#.+notice-response-message+
 	   (let ((message (read-socket-value-string socket)))
-	     (warn 'postgresql-warning
-		   :connection connection :message message)))
+	     (unless (eq :ignore clsql-sys:*backend-warning-behavior*)
+	       (warn 'postgresql-warning
+		     :connection connection :message message))))
 	  (#.+notification-response-message+
 	   (let ((pid (read-socket-value-int32 socket))
 		 (message (read-socket-value-string socket)))