From: Paul Khuong Date: Wed, 21 Aug 2013 03:53:01 +0000 (-0400) Subject: Replace the Kitten of Death message with a warning in the banner X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=b7d22ded1428e8d3e87c37164aa6742dd28aa6ce;p=sbcl.git Replace the Kitten of Death message with a warning in the banner * Arguably, the Windows ports are now as (un)stable as the other non-Linux/x86oid ports. * Either way, the warning is now disabled by --noinform. * Also, replace the lossage message when the initial thread returns with a clearer description of the situation. --- diff --git a/NEWS b/NEWS index b909a15..c377988 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ changes relative to sbcl-1.1.10 * enhancement: support building the manual under texinfo version 5. (lp#1189146) + * enhancement: Windows builds no longer display the "Kitten of Death" message. + A warning is instead appended to the regular banner, and may be muted with + --noinform. * bug fix: undefined function errors are now properly reported on PPC and MIPS. (regression since 1.1.9) * bug fix: (funcall (function X junk)) didn't causes an error when X had a diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c index cacc9c7..b95ed51 100644 --- a/src/runtime/runtime.c +++ b/src/runtime/runtime.c @@ -217,7 +217,15 @@ SBCL is free software, provided as is, with absolutely no warranty.\n\ It is mostly in the public domain; some portions are provided under\n\ BSD-style licenses. See the CREDITS and COPYING files in the\n\ distribution for more information.\n\ -", SBCL_VERSION_STRING); +" +#ifdef LISP_FEATURE_WIN32 +"\n\ +WARNING: the Windows port is fragile, particularly for multithreaded\n\ +code. Unfortunately, the development team currently lacks the time\n\ +and resources this platform demands.\n\ +" +#endif +, SBCL_VERSION_STRING); } /* Look for a core file to load, first in the directory named by the @@ -700,14 +708,7 @@ main(int argc, char *argv[], char *envp[]) FSHOW((stderr, "/funcalling initial_function=0x%lx\n", (unsigned long)initial_function)); -#ifdef LISP_FEATURE_WIN32 - fprintf(stderr, "\n\ -This is experimental prerelease support for the Windows platform: use\n\ -at your own risk. \"Your Kitten of Death awaits!\"\n"); - fflush(stdout); - fflush(stderr); -#endif create_initial_thread(initial_function); - lose("CATS. CATS ARE NICE.\n"); + lose("unexpected return from initial thread in main()\n"); return 0; }