X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftoplevel.lisp;h=416949b281ea8f965035a9f350cb971f41270c8c;hb=cf0b72cd4052a09b9a305081524bd44e2948c1e5;hp=fcd8a5e73e9a0d59af3f653a615054924d68ddf4;hpb=a4a5e8fb87c7af981cb4c759dc3c5e6d44074f42;p=sbcl.git diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp index fcd8a5e..416949b 100644 --- a/src/code/toplevel.lisp +++ b/src/code/toplevel.lisp @@ -26,8 +26,8 @@ ;;; FIXME: These could be converted to DEFVARs. (declaim (special #!+(or x86 x86-64) *pseudo-atomic-bits* - sb!unix::*interrupts-enabled* - sb!unix::*interrupt-pending* + *interrupts-enabled* + *interrupt-pending* *type-system-initialized*)) (defvar *cold-init-complete-p*) @@ -41,7 +41,7 @@ (defun sysinit-pathname () (or (let ((sbcl-homedir (sbcl-homedir-pathname))) (when sbcl-homedir - (probe-file (merge-pathnames sbcl-homedir "sbclrc")))) + (probe-file (merge-pathnames "sbclrc" sbcl-homedir)))) #!+win32 (merge-pathnames "sbcl\\sbclrc" (sb!win32::get-folder-pathname