From 0677c33068646b6ec33d5f622771673f3de38504 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Sat, 7 Jun 2003 22:46:08 +0000 Subject: [PATCH] 0.8.0.47 sb-simple-streams pushes :little-endian/:big-endian on *features* for no apparent reason - and gets it wrong, too unix-lseek is fixed, so sb-simple-streams need not redefine it any more Fix stupid braino in unix-ioctl that broke the build --- contrib/sb-simple-streams/classes.lisp | 10 ---------- contrib/sb-simple-streams/unix.lisp | 18 ------------------ src/code/unix.lisp | 14 ++++++++------ version.lisp-expr | 2 +- 4 files changed, 9 insertions(+), 35 deletions(-) diff --git a/contrib/sb-simple-streams/classes.lisp b/contrib/sb-simple-streams/classes.lisp index 1ade55e..0ad1d44 100644 --- a/contrib/sb-simple-streams/classes.lisp +++ b/contrib/sb-simple-streams/classes.lisp @@ -10,16 +10,6 @@ ;;; (pushnew :sb-simple-stream *features*) -(eval-when (:compile-toplevel :load-toplevel :execute) - #+(or X86) (pushnew :little-endian *features*)) - -(eval-when (:compile-toplevel :load-toplevel :execute) - #-little-endian (pushnew :big-endian *features*)) - -(eval-when (:compile-toplevel :load-toplevel :execute) - #-(or big-endian little-endian) (error "Unsupported architecture")) - - ;;; ;;; TYPES FOR BUFFER AND STRATEGY FUNCTIONS ;;; diff --git a/contrib/sb-simple-streams/unix.lisp b/contrib/sb-simple-streams/unix.lisp index ff15c89..f75d7c5 100644 --- a/contrib/sb-simple-streams/unix.lisp +++ b/contrib/sb-simple-streams/unix.lisp @@ -13,24 +13,6 @@ (in-package "SB-UNIX") -;;; TODO (Rudi 2003-05-12): Check whether this bug exists in sbcl, fix -;;; it if yes, and take care not to break platforms where the offset -;;; is not a 32-bit signed integer. - -;; Fix bug that claims offset is unsigned, so seeking backwards works! -(defun unix-lseek (fd offset whence) - "Unix-lseek accepts a file descriptor and moves the file pointer ahead - a certain offset for that file. Whence can be any of the following: - - l_set Set the file pointer. - l_incr Increment the file pointer. - l_xtnd Extend the file size. - " - (declare (type unix-fd fd) - (type (signed-byte 32) offset) - (type (integer 0 2) whence)) - (int-syscall ("lseek" int off-t int) fd offset whence)) - (export '(prot-read prot-write prot-exec prot-none map-shared map-private map-fixed unix-mmap unix-munmap diff --git a/src/code/unix.lisp b/src/code/unix.lisp index 382d034..d96189e 100644 --- a/src/code/unix.lisp +++ b/src/code/unix.lisp @@ -209,12 +209,14 @@ (declare (type unix-fd fd)) (int-syscall ("isatty" int) fd)) -;;; Accept a file descriptor and move the file pointer ahead -;;; a certain offset for that file. WHENCE can be any of the following: -;;; L_SET Set the file pointer. -;;; L_INCR Increment the file pointer. -;;; L_XTND Extend the file size. (defun unix-lseek (fd offset whence) + "Unix-lseek accepts a file descriptor and moves the file pointer by + OFFSET octets. Whence can be any of the following: + + L_SET Set the file pointer. + L_INCR Increment the file pointer. + L_XTND Extend the file size. + " (declare (type unix-fd fd) (type (integer 0 2) whence)) (int-syscall ("lseek" int off-t int) fd offset whence)) @@ -401,7 +403,7 @@ (defun unix-ioctl (fd cmd arg) (declare (type unix-fd fd) (type (signed-byte 32) cmd)) - (void-syscall ("ioctl" int signed-int (* char)) fd cmd arg)) + (void-syscall ("ioctl" int int (* char)) fd cmd arg)) ;;;; sys/resource.h diff --git a/version.lisp-expr b/version.lisp-expr index e471612..65554de 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.0.46" +"0.8.0.47" -- 1.7.10.4