Changeset 13383

Timestamp:

Jan 12, 2010, 11:27:44 AM (15 years ago)

Author:

R. Matthew Emerson

Message:

Merge r13382 (EAI_xxx error codes negative on Linux) from trunk.

Location:

branches/working-0711/ccl

Files:

• . (modified) (1 prop)
• level-1/l1-sockets.lisp (modified) (2 diffs, 1 prop)

branches/working-0711/ccl/level-1/l1-sockets.lisp

@@ -238 +238 @@
 
 #-windows-target
-(defun %gai-strerror (errno)
-  (let* ((err (abs errno))
-         (p (#_gai_strerror err)))
+(defun %gai-strerror (err)
+  (let ((p (#_gai_strerror err)))
     (if (%null-ptr-p p)
       (format nil "Unknown nameserver error ~d" err)
@@ -248 +247 @@
   "Creates and signals (via error) one of two socket error 
 conditions, based on the state of the arguments."
-  (when (< errno 0)
-    (setq errno (- errno)))
+  (unless nameserver-p
+    (setq errno (abs errno)))
   (if stream
     (error (make-condition 'socket-error