[usocket-cvs] r476 - in usocket: branches/0.4.x/backend branches/experimental-udp/backend trunk/backend

[Chun Tian (binghe)]

Author: ctian
Date: Wed Nov 12 14:18:15 2008
New Revision: 476

Log:
[bugfix] read macro fix for detect on version before 4.4.5

Modified:
   usocket/branches/0.4.x/backend/lispworks.lisp
   usocket/branches/experimental-udp/backend/lispworks.lisp
   usocket/trunk/backend/lispworks.lisp

Modified: usocket/branches/0.4.x/backend/lispworks.lisp
==============================================================================
--- usocket/branches/0.4.x/backend/lispworks.lisp	(original)
+++ usocket/branches/0.4.x/backend/lispworks.lisp	Wed Nov 12 14:18:15 2008
@@ -98,7 +98,7 @@
   (when deadline
     (unimplemented 'deadline 'socket-connect))
 
-  #+(or lispworks4.2 lispworks4.3) ; < 4.4.5
+  #+(and lispworks4 (not lispworks4.4)) ; < 4.4.5
   (when timeout
     (unsupported 'timeout 'socket-connect :minimum "LispWorks 4.4.5"))
   
@@ -118,8 +118,8 @@
           (with-mapped-conditions ()
              (comm:open-tcp-stream hostname port
                                    :element-type element-type
-				   #-(or lispworks4.2 lispworks4.3) ; >= 4.4.5
-				   #-(or lispworks4.2 lispworks4.3)
+				   #-(and lispworks4 (not lispworks4.4)) ; >= 4.4.5
+				   #-(and lispworks4 (not lispworks4.4))
 				   :timeout timeout
                                    #-lispworks4 #-lispworks4
                                    #-lispworks4 #-lispworks4

Modified: usocket/branches/experimental-udp/backend/lispworks.lisp
==============================================================================
--- usocket/branches/experimental-udp/backend/lispworks.lisp	(original)
+++ usocket/branches/experimental-udp/backend/lispworks.lisp	Wed Nov 12 14:18:15 2008
@@ -255,7 +255,7 @@
   (when deadline
     (unimplemented 'deadline 'socket-connect))
 
-  #+(or lispworks4.2 lispworks4.3) ; < 4.4.5
+  #+(and lispworks4 (not lispworks4.4)) ; < 4.4.5
   (when timeout
     (unsupported 'timeout 'socket-connect :minimum "LispWorks 4.4.5"))
 
@@ -277,8 +277,8 @@
 	     (with-mapped-conditions ()
 	       (comm:open-tcp-stream hostname port
 				     :element-type element-type
-				     #-(or lispworks4.2 lispworks4.3) ; >= 4.4.5
-				     #-(or lispworks4.2 lispworks4.3)
+				     #-(and lispworks4 (not lispworks4.4)) ; >= 4.4.5
+				     #-(and lispworks4 (not lispworks4.4))
 				     :timeout timeout
 				     #-lispworks4 #-lispworks4
 				     #-lispworks4 #-lispworks4

Modified: usocket/trunk/backend/lispworks.lisp
==============================================================================
--- usocket/trunk/backend/lispworks.lisp	(original)
+++ usocket/trunk/backend/lispworks.lisp	Wed Nov 12 14:18:15 2008
@@ -98,7 +98,7 @@
   (when deadline
     (unimplemented 'deadline 'socket-connect))
   
-  #+(or lispworks4.2 lispworks4.3) ; < 4.4.5
+  #+(and lispworks4 (not lispworks4.4)) ; < 4.4.5
   (when timeout
     (unsupported 'timeout 'socket-connect :minimum "LispWorks 4.4.5"))
 
@@ -118,8 +118,8 @@
           (with-mapped-conditions ()
              (comm:open-tcp-stream hostname port
                                    :element-type element-type
-				   #-(or lispworks4.2 lispworks4.3) ; >= 4.4.5
-				   #-(or lispworks4.2 lispworks4.3)
+				   #-(and lispworks4 (not lispworks4.4)) ; >= 4.4.5
+				   #-(and lispworks4 (not lispworks4.4))
 				   :timeout timeout
                                    #-lispworks4 #-lispworks4
                                    #-lispworks4 #-lispworks4