[Ecls-list] Fixes for the current git master, MSVC and not.

[Samium Gromoff]

From: Samium Gromoff <_deepfire at feelingofgreen.ru>
Subject: Re: [Ecls-list] Fixes for the current git master, MSVC and not.
Date: Thu, 30 Oct 2008 08:32:14 +0300 (MSK)

> From: "Juan Jose Garcia-Ripoll" <juanjose.garciaripoll at googlemail.com>
> > On Fri, Oct 24, 2008 at 5:36 PM, Samium Gromoff
> > <_deepfire at feelingofgreen.ru> wrote:
> > > The "local" branch on git://git.feelingofgreen.ru/ecl is tipped off
> > > the current master and contains three trivial build fixes and one
> > > substantive change to fix ASDF:MAKE-BUILD's behavior on MSVC.
> > 
> > I have fixed most things except for the library changes you have,
> > which I will commit later on. Everything is now both on CVS and on
> > GIT.
> 
> I've renamed the branch to "win32-msvc-stable", and it contains a couple
> more fixes (which aren't MSVC-specific) plus that /IMPLIB rerouting bit.

The fixes:

    01-fixnump-isnt-in-clos.diff
    02-use-dffi-isnt-in-si.diff


regards, Samium Gromoff


diff --git a/src/clos/standard.lsp b/src/clos/standard.lsp
index b8ba97a..8db12e8 100644
--- a/src/clos/standard.lsp
+++ b/src/clos/standard.lsp
@@ -548,7 +548,7 @@ because it contains a reference to the undefined class~%  ~A"
 		       (table (slot-table class))
 		       (slotd (gethash slot-name table))
 		       (index (slot-definition-location slotd)))
-		  (if (fixnump index)
+		  (if (si::fixnump index)
 		      (si:instance-set self (the fixnum index) value)
 		      (rplaca (the cons index) value)))))))
 
diff --git a/src/lsp/ffi.lsp b/src/lsp/ffi.lsp
index 5ce1774..6a1209a 100644
--- a/src/lsp/ffi.lsp
+++ b/src/lsp/ffi.lsp
@@ -538,7 +538,7 @@
 
 (defmacro def-function (name args &key module (returning :void) (call :cdecl))
   #+DFFI 
-  (when (and module si::*use-dffi*)
+  (when (and module *use-dffi*)
     (return-from def-function
       `(def-lib-function ,name ,args :returning ,returning :module ,module :call ,call)))
   (multiple-value-bind (c-name lisp-name)
@@ -575,7 +575,7 @@
                           (and (consp ffi-type)
                                (member (first ffi-type) '(* :array)))))
 	   (inline-form (cond #+dffi
-                              ((and module si::*use-dffi*)
+                              ((and module *use-dffi*)
 			       `(si::find-foreign-symbol ,c-name ,module ',type ,(size-of-foreign-type type)))
 			      (t
 			       `(c-inline () () :object
@@ -656,7 +656,7 @@
                           `((eval-when (:compile-toplevel)
                               (do-load-foreign-library ,filename
 				,system-library)))))
-       (dyn-form #+dffi (when (and (not system-library) si::*use-dffi*)
+       (dyn-form #+dffi (when (and (not system-library) *use-dffi*)
                           `((si:load-foreign-module ,filename)))
                  #-dffi nil))
    `(progn , at compile-form , at dyn-form)))
@@ -671,7 +671,7 @@
 
 #+dffi
 (defmacro defcallback (name ret-type arg-desc &body body)
-  (if si::*use-dffi*
+  (if *use-dffi*
       (multiple-value-bind (name call-type) (if (consp name)
                                                 (values-list name)
                                                 (values name :cdecl))