From bdc75e42dac1ae5edc07d99d05294fddb1ed9e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Thu, 16 Feb 2017 20:44:07 +0100 Subject: [PATCH] encodings: don't fake ext:make-encoding in dispatch table si_make_encoding was bound to ext:make-encoding before version in iolib.lsp was overwriting it. That caused maybe_fix_console to fail on Windows due to infinite concurrency (si_make_encoding called itself, because iolib.lsp wasn't called yet). Fixes #160. --- src/c/symbols_list.h | 2 +- src/c/symbols_list2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/c/symbols_list.h b/src/c/symbols_list.h index 77d0b5387..6f2eaf37c 100755 --- a/src/c/symbols_list.h +++ b/src/c/symbols_list.h @@ -1893,7 +1893,7 @@ cl_symbols[] = { {KEY_ "UCS-4LE", KEYWORD, NULL, -1, OBJNULL}, {EXT_ "LOAD-ENCODING", EXT_ORDINARY, ECL_NAME(si_load_encoding), 1, OBJNULL}, -{EXT_ "MAKE-ENCODING", EXT_ORDINARY, si_make_encoding, 1, OBJNULL}, +{EXT_ "MAKE-ENCODING", EXT_ORDINARY, NULL, 1, OBJNULL}, {EXT_ "ALL-ENCODINGS", EXT_ORDINARY, NULL, -1, OBJNULL}, {KEY_ "US-ASCII", KEYWORD, NULL, -1, OBJNULL}, diff --git a/src/c/symbols_list2.h b/src/c/symbols_list2.h index bcb52e6d4..891ee10c3 100644 --- a/src/c/symbols_list2.h +++ b/src/c/symbols_list2.h @@ -1893,7 +1893,7 @@ cl_symbols[] = { {KEY_ "UCS-4LE",NULL}, {EXT_ "LOAD-ENCODING","ECL_NAME(si_load_encoding)"}, -{EXT_ "MAKE-ENCODING","si_make_encoding"}, +{EXT_ "MAKE-ENCODING",NULL}, {EXT_ "ALL-ENCODINGS",NULL}, {KEY_ "US-ASCII",NULL},