mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-01-23 04:52:42 -08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into 'develop'

Browse source 
patch for windows ReadConsole bug

See merge request !69
This commit is contained in:
Daniel Kochmański 2017-06-05 06:03:40 +00:00
commit da47ed7f5f
5 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
msvc/Makefile
View file

@ -26,6 +26,7 @@ THEHOST = win32
# p0 -> Pentium processor
# p3 -> Pentium III processor
# p4 -> Pentium IV processor
# amd64 -> X86_64 compatible processor
!if "$(GMP_TYPE)" == ""
GMP_TYPE = gc
!endif
@ -60,6 +61,14 @@ ECL_DEFSYS =
# Profiling
ECL_PROFILE =
!if "$(YASM)" == ""
!if "$(ECL_WIN64)" != ""
YASM=yasm-1.3.0-win64.exe
!else
YASM=yasm-1.3.0-win32.exe
!endif
!endif
# <END> (ECL configuration)
# =============================================================
@ -79,9 +88,6 @@ MV = move /Y
MSDEV = msdev
MKNSI = makensis.exe
!if "$(YASM)" == ""
YASM=yasm-1.2.0-win32.exe
!endif
# ==================== Flags ====================
@ -417,7 +423,7 @@ clean: clean_ecl clean_lisp
-$(RM) .gdbinit cinit.lib ecl_min.lib
-$(RM) bdwgc\*.pdb
cd gc
-$(MAKE) ECL_THREADS=$(ECL_THREADS) clean
-$(MAKE) $(GCFLAGS) ECL_THREADS=$(ECL_THREADS) "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" "MY_CPU=$(GC_CPU)" clean
cd ..
-for %h in (gc.h gc_local_alloc.h gc_pthread_redirects.h \
gc_config_macros.h leak_detector.h gc_typed.h \
@ -426,7 +432,8 @@ clean: clean_ecl clean_lisp
-$(RMDIR) ecl\gc\private
-$(RMDIR) ecl\gc
cd gmp
-$(MAKE) ECL_THREADS=$(ECL_THREADS) clean
-$(MAKE) "MPN_TYPE=$(GMP_TYPE)" "CFLAGS_CONFIG=$(CFLAGS_CONFIG)" \
"BITS=$(GMP_BITS)" "YASM=$(YASM)" clean
cd ..
-$(RM) ecl\gmp.h
clean_ecl:
@ -438,7 +445,10 @@ clean_ecl:
ecl-cc.bat ecl.rc ecl.res) \
do $(RM) %i
cd c
-$(MAKE) ECL_THREADS=$(ECL_THREADS) clean
-$(MAKE) ECL_VERSION_NUMBER=$(ECL_VERSION_NUMBER) \
ECL_THREADS=$(ECL_THREADS) ECL_UNICODE=$(ECL_UNICODE) \
ECL_SSE=$(ECL_SSE) ECL_WIN64=$(ECL_WIN64) \
"ECL_CFLAGS=$(CFLAGS) -DGC_BUILD" clean
cd ..
clean_lisp:
-for %i in (lsp clos $(ECL_MODULES)) do for %k in (%i.lib %i.fas %i.ilk %i.c %i.obj %i.pdb) do $(RM) %k

1
msvc/gmp/Makefile
View file

@ -615,6 +615,7 @@ msvc-build: build.vc8\config-vc8.$(MPN_TYPE) build.vc8\gmp.h
clean:
-erase mpn\generic\*.obj
-erase mpn\amd64i\*.obj
-erase mpn\*.obj
-erase mpz\*.obj
-erase *.obj

BIN
msvc/gmp/build.vc8/gmp.ncb
View file

Binary file not shown.

BIN
msvc/gmp/build.vc8/gmp.suo
View file

Binary file not shown.

6
src/c/file.d
View file

@ -3879,10 +3879,14 @@ wcon_stream_read_byte8(cl_object strm, unsigned char *c, cl_index n)
HANDLE h = (HANDLE)IO_FILE_DESCRIPTOR(strm);
DWORD nchars;
unsigned char aux[4];
WCHAR waux[1];
for (len = 0; len < n; ) {
int i, ok;
ecl_disable_interrupts_env(the_env);
ok = ReadConsole(h, &aux, 1, &nchars, NULL);
ok = ReadConsoleW(h, waux, 1, &nchars, NULL);
if (ok) {
nchars = WideCharToMultiByte(GetConsoleCP(), 0, waux, 1, aux, 4, NULL, NULL);
}
ecl_enable_interrupts_env(the_env);
unlikely_if (!ok) {
FEwin32_error("Cannot read from console", 0);