[usocket-cvs] r673 - in usocket/branches/0.5.x: . backend

[ctian at common-lisp.net]

Author: ctian
Date: Fri Aug 26 22:46:28 2011
New Revision: 673

Log:
[ACL] Fixed for Allegro CL modern mode (merged from trunk, r671)

Modified:
   usocket/branches/0.5.x/CHANGES
   usocket/branches/0.5.x/backend/allegro.lisp
   usocket/branches/0.5.x/usocket.lisp

Modified: usocket/branches/0.5.x/CHANGES
==============================================================================
--- usocket/branches/0.5.x/CHANGES	Fri Aug 26 22:43:51 2011	(r672)
+++ usocket/branches/0.5.x/CHANGES	Fri Aug 26 22:46:28 2011	(r673)
@@ -1,6 +1,7 @@
 0.5.4:
 
 * Bugfix: [ECL] Fixed for ECL's MAKE-BUILD by removing some unecessary code (reported by Juan Jose Garcia-Ripoll, the ECL maintainer)
+* Bugfix: [ACL] Fixed for Allegro CL modern mode.
 
 0.5.3:
 

Modified: usocket/branches/0.5.x/backend/allegro.lisp
==============================================================================
--- usocket/branches/0.5.x/backend/allegro.lisp	Fri Aug 26 22:43:51 2011	(r672)
+++ usocket/branches/0.5.x/backend/allegro.lisp	Fri Aug 26 22:46:28 2011	(r673)
@@ -199,5 +199,5 @@
       ;; [Same code is also used in openmcl.lisp]
       (dolist (x active-internal-sockets)
         (setf (state (gethash x (wait-list-map wait-list)))
-              :READ))
+              :read))
       wait-list)))

Modified: usocket/branches/0.5.x/usocket.lisp
==============================================================================
--- usocket/branches/0.5.x/usocket.lisp	Fri Aug 26 22:43:51 2011	(r672)
+++ usocket/branches/0.5.x/usocket.lisp	Fri Aug 26 22:46:28 2011	(r673)
@@ -325,11 +325,12 @@
          (sockets-ready 0))
     (dolist (x (wait-list-waiters socket-or-sockets))
       (when (setf (state x)
-                  #+(and win32 (or sbcl ecl)) NIL ; they cannot relay on LISTEN
+                  #+(and win32 (or sbcl ecl)) nil ; they cannot rely on LISTEN
                   #-(and win32 (or sbcl ecl))
                   (if (and (stream-usocket-p x)
                            (listen (socket-stream x)))
-                      :READ NIL))
+                      :read
+                      nil))
         (incf sockets-ready)))
     ;; the internal routine is responsibe for
     ;; making sure the wait doesn't block on socket-streams of