[cells-cvs] CVS update: cell-cultures/hello-c/arrays.lisp cell-cultures/hello-c/callbacks.lisp cell-cultures/hello-c/hello-c.lpr

[Kenny Tilton]

Update of /project/cells/cvsroot/cell-cultures/hello-c
In directory common-lisp.net:/tmp/cvs-serv4568/hello-c

Modified Files:
	arrays.lisp callbacks.lisp hello-c.lpr 
Log Message:
Apply Andras SImon's patches from Apr 2005 to get things working on CMU and ACL/Linux
Date: Wed Apr  6 20:06:22 2005
Author: ktilton

Index: cell-cultures/hello-c/arrays.lisp
diff -u cell-cultures/hello-c/arrays.lisp:1.1 cell-cultures/hello-c/arrays.lisp:1.2
--- cell-cultures/hello-c/arrays.lisp:1.1	Tue Dec 14 04:58:48 2004
+++ cell-cultures/hello-c/arrays.lisp	Wed Apr  6 20:06:22 2005
@@ -38,6 +38,9 @@
 #+check
 (fgn-dump)
 
+(defun ffx-reset (&optional force)
+  (hic-reset force))
+
 (defun hic-reset (&optional force)
   (if force
       (progn
@@ -184,7 +187,7 @@
   `(deref-array ,pa '(:array (* :void)) ,n))
 
 (eval-when (compile load eval)
-  (export '(
+  (export '(ffx-reset
            ff-elt ff-list
            eltf eltd elti fgn-pa
            with-ff-array-elements


Index: cell-cultures/hello-c/callbacks.lisp
diff -u cell-cultures/hello-c/callbacks.lisp:1.1 cell-cultures/hello-c/callbacks.lisp:1.2
--- cell-cultures/hello-c/callbacks.lisp:1.1	Tue Dec 14 04:58:48 2004
+++ cell-cultures/hello-c/callbacks.lisp	Wed Apr  6 20:06:22 2005
@@ -35,7 +35,8 @@
 
 (defmacro ff-defun-callable (call-convention result-type name args &body body)
   (declare (ignorable result-type))
-  (let ((native-args (process-function-args args)))
+  (let ((native-args (when args ;; without this p-f-a returns '(:void) as if for declare
+                       (process-function-args args))))
     #+lispworks
     `(fli:define-foreign-callable
       (,(symbol-name name) :result-type ,result-type :calling-convention ,call-convention)


Index: cell-cultures/hello-c/hello-c.lpr
diff -u cell-cultures/hello-c/hello-c.lpr:1.1 cell-cultures/hello-c/hello-c.lpr:1.2
--- cell-cultures/hello-c/hello-c.lpr:1.1	Tue Dec 14 04:58:48 2004
+++ cell-cultures/hello-c/hello-c.lpr	Wed Apr  6 20:06:22 2005
@@ -1,11 +1,10 @@
-;; -*- lisp-version: "6.2 [Windows] (Sep 3, 2004 12:04)"; common-graphics: "1.389.2.105.2.14"; -*-
+;; -*- lisp-version: "7.0 [Windows] (Dec 28, 2004 17:34)"; cg: "1.54.2.17"; -*-
 
-(in-package :common-graphics-user)
+(in-package :cg-user)
 
-(defpackage :hello-c (:export))
+(defpackage :HELLO-C)
 
 (define-project :name :hello-c
-  :application-type (intern "Standard EXE" (find-package :keyword))
   :modules (list (make-instance 'module :name "package.lisp")
                  (make-instance 'module :name "primitives.lisp")
                  (make-instance 'module :name "objects.lisp")
@@ -20,28 +19,20 @@
   :projects nil
   :libraries nil
   :distributed-files nil
+  :internally-loaded-files nil
   :project-package-name :hello-c
   :main-form nil
   :compilation-unit t
   :verbose nil
-  :runtime-modules '(:cg :drag-and-drop :lisp-widget
-                     :multi-picture-button :common-control
-                     :edit-in-place :outline :grid :group-box
-                     :header-control :progress-indicator-control
-                     :common-status-bar :tab-control :trackbar-control
-                     :up-down-control :dde :mci :carets :hotspots
-                     :menu-selection :choose-list :directory-list
-                     :color-dialog :find-dialog :font-dialog
-                     :string-dialog :yes-no-list-dialog
-                     :list-view-control :rich-edit :drawable :ole :www
-                     :aclwin302)
+  :runtime-modules nil
   :splash-file-module (make-instance 'build-module :name "")
   :icon-file-module (make-instance 'build-module :name "")
-  :include-flags '(:compiler :top-level :local-name-info)
+  :include-flags '(:local-name-info)
   :build-flags '(:allow-debug :purify)
   :autoload-warning t
   :full-recompile-for-runtime-conditionalizations nil
   :default-command-line-arguments "+cx +t \"Initializing\""
+  :additional-build-lisp-image-arguments '(:read-init-files nil)
   :old-space-size 256000
   :new-space-size 6144
   :runtime-build-option :standard