Skip to content

Commit

Permalink
1.0.43.13: "minor fixed for Win32" from Kalyanov Dmitry
Browse files Browse the repository at this point in the history
 * fix run-sbcl.sh for cygwin: need to convert the path.

 * fix contrib building for cygwin with GCC 4.x installed: require GCC
   3.x since GCC 4.x apparently doesn't do -mno-cygwin.

 * PeekConsoleInput's third argument is the number of array in elements,
   not bytes. https://msdn.microsoft.com/en-us/library/ms684344%28VS.85%29.aspx
   Old usage led to stack overwriting.
  • Loading branch information
nikodemus committed Sep 30, 2010
1 parent ded7da3 commit 0d67e11
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
6 changes: 6 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ changes relative to sbcl-1.0.43:
spuriously when reading from a pipe (lp#643686)
* bug fix: more efficient timer expiry should avoid starvation on systems
where number of SIGALRMs per second is restricted. (lp#375515)
* improvements to the Windows port:
** bug fix: stackoverwriting due to incorrect usage of PeekConsoleInput
on Windows. (thanks to Kalyanov Dmitry)
** bug fix: build now works on cygwin with GCC 4.x installed. (thanks to
Kalyanov Dmitry)
** bug fix: run-sbcl.sh now works on Cygwin. (thanks to Kalyanov Dmitry)

changes in sbcl-1.0.43 relative to sbcl-1.0.42:
* incompatible change: FD-STREAMS no longer participate in the serve-event
Expand Down
2 changes: 2 additions & 0 deletions contrib/asdf-module.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ ifeq (SunOS,$(UNAME))
endif
ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
EXTRA_CFLAGS=-mno-cygwin
# GCC 4.x doesn't accept -mno-cygwin.
CC:=gcc=3
# SBCL can't read cygwin symlinks, and cygwin likes to symlink
# gcc. To further complicate things, SBCL can't handle cygwin
# paths, either.
Expand Down
4 changes: 4 additions & 0 deletions run-sbcl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ else
BASE=`pwd`
cd "${opwd}"
fi
if [ "$OSTYPE" = "cygwin" ]
then
BASE=`cygpath -w "$BASE"`
fi
CORE_DEFINED=no

for arg in $*; do
Expand Down
2 changes: 1 addition & 1 deletion src/code/win32.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@

(unless (zerop (peek-console-input handle
(cast buf (* t))
input-record-size (addr avail)))
1 (addr avail)))
(return-from handle-listen (plusp avail)))

;; FIXME-SOCKETS: Try again here with WSAEventSelect in case
Expand Down
2 changes: 1 addition & 1 deletion version.lisp-expr
Original file line number Diff line number Diff line change
Expand Up @@ -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".)
"1.0.43.12"
"1.0.43.13"

0 comments on commit 0d67e11

Please sign in to comment.