[bknr-cvs] r1827 - in trunk/bknr: . src/utils

[bknr at bknr.net]

Author: hhubner
Date: 2006-02-09 23:22:28 -0600 (Thu, 09 Feb 2006)
New Revision: 1827

Modified:
   trunk/bknr/init.lisp
   trunk/bknr/src/utils/crypt-md5.lisp
   trunk/bknr/src/utils/reader.lisp
   trunk/bknr/src/utils/utils.lisp
Log:
Tchadvar Roussanov:

This is a small patch for init.lisp and some fixes to make sbcl compiler
happy with 'defconstant'.


Modified: trunk/bknr/init.lisp
===================================================================
--- trunk/bknr/init.lisp	2006-02-08 06:02:22 UTC (rev 1826)
+++ trunk/bknr/init.lisp	2006-02-10 05:22:28 UTC (rev 1827)
@@ -45,12 +45,14 @@
                           :version :wild)
            (user-homedir-pathname))))))
 
-#-sbcl
 (eval-when (:execute :compile-toplevel :load-toplevel)
-  (load #p"bknr-thirdparty:asdf;asdf"))
+  #-sbcl
+  (load #p"bknr-thirdparty:asdf;asdf")
+  #+sbcl
+  (require :asdf))
 
-(push (translate-logical-pathname #p"bknr:src;") asdf:*central-registry*)
-(push (translate-logical-pathname #p"eboy:src;") asdf:*central-registry*)
+(pushnew (translate-logical-pathname #p"bknr:src;") asdf:*central-registry* :test #'equal)
+(pushnew (translate-logical-pathname #p"eboy:src;") asdf:*central-registry* :test #'equal)
 
 (defparameter *patch-directory* "bknr:patches;")
 
@@ -103,4 +105,4 @@
 (setup-registry)
 (fix-dpd)
 
-(push :cl-gd-gif *features*)
+(pushnew :cl-gd-gif *features*)

Modified: trunk/bknr/src/utils/crypt-md5.lisp
===================================================================
--- trunk/bknr/src/utils/crypt-md5.lisp	2006-02-08 06:02:22 UTC (rev 1826)
+++ trunk/bknr/src/utils/crypt-md5.lisp	2006-02-10 05:22:28 UTC (rev 1827)
@@ -1,6 +1,6 @@
 (in-package :bknr.utils)
 
-(defconstant +itoa64+
+(define-constant +itoa64+
   "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")
 
 (defun itoa64 (int num)
@@ -73,4 +73,4 @@
 ;; 2 8 14 (4)
 ;; 3 9 15 (4)
 ;; 4 10 5 (4)
-;; 11     (2)
\ No newline at end of file
+;; 11     (2)

Modified: trunk/bknr/src/utils/reader.lisp
===================================================================
--- trunk/bknr/src/utils/reader.lisp	2006-02-08 06:02:22 UTC (rev 1826)
+++ trunk/bknr/src/utils/reader.lisp	2006-02-10 05:22:28 UTC (rev 1827)
@@ -1,6 +1,6 @@
 (in-package :bknr.utils)
 
-(defconstant +whitespace-chars+
+(define-constant +whitespace-chars+
   '(#\Space #\Newline #\Tab #\Linefeed))
 
 (defun whitespace-char-p (c)

Modified: trunk/bknr/src/utils/utils.lisp
===================================================================
--- trunk/bknr/src/utils/utils.lisp	2006-02-08 06:02:22 UTC (rev 1826)
+++ trunk/bknr/src/utils/utils.lisp	2006-02-10 05:22:28 UTC (rev 1827)
@@ -1,5 +1,9 @@
 (in-package :bknr.utils)
 
+(defmacro define-constant (name value &optional doc)
+  "Macro for use in place of defconstant in order to  make SBCL compiler happy"
+  `(defconstant ,name (if (boundp ',name) (symbol-value ',name) ,value)
+                           ,@(when doc (list doc))))
 ;;; date format
 
 ;; Zeitzone für Mail-Zeitstempel