From cb2a666fa12624fe1c87d25df234b1f2ee09153b Mon Sep 17 00:00:00 2001 From: duane <duane> Date: Sat, 4 Mar 2000 05:13:53 +0000 Subject: [PATCH] see 2.2.2.8 changelog entry for Fri Mar 3 20:47:21 PST 2000 --- ChangeLog.n | 17 +++++++++++ Makefile | 4 ++- Makefile.alpha | 12 +++++++- tk/convenience.lisp | 4 +-- tk/font.lisp | 14 ++++----- tk/resources.lisp | 12 ++++---- tk/xlib.lisp | 18 ++++++------ tk/xm-funs.lisp | 34 ++++++++++----------- tk/xt-funs.lisp | 62 +++++++++++++++++++-------------------- utils/lisp-utilities.lisp | 12 ++++---- utils/packages.lisp | 6 ++-- wnn/jl-funs.lisp | 10 +++---- 12 files changed, 116 insertions(+), 89 deletions(-) diff --git a/ChangeLog.n b/ChangeLog.n index 475374ba..bd5e83dd 100644 --- a/ChangeLog.n +++ b/ChangeLog.n @@ -10,6 +10,23 @@ If there are user-visible changes in this commit, then list the <standard changelog date stamp> * <changes go here...> +******************************************************************************* +2.2.2.8 + +Fri Mar 3 20:47:21 PST 2000 Duane Rettig <duane@beta> + + * Makefile: Add SIXTYFOURBIT def + * Makefile.alpha: Add 64-bit port + * tk/convenience.lisp: :unsigned-integer -> :foreign-address + * tk/font.lisp: Add 64-bit + * tk/resources.lisp: Add 64-bit + * tk/xlib.lisp: Add 64-bit + * tk/xm-funs.lisp: Add 64-bit + * tk/xt-funs.lisp: Add 64-bit + * utils/lisp-utilities.lisp: Add 64-bit + * utils/packages.lisp: Incf version + * wnn/jl-funs.lisp: Add 64-bit + ******************************************************************************* 2000-02-25 Charles A. Cox <cox@delta> diff --git a/Makefile b/Makefile index 231dd30c..219cc639 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile,v 1.88 1999/05/04 01:20:59 layer Exp $ +# $Header: /repo/cvs.copy/clim2/Makefile,v 1.89 2000/03/04 05:13:48 duane Exp $ # If ../makefile.top doesn't exist, then you must specify HOST=xxx on the # `make' command line. @@ -6,6 +6,8 @@ include ../makefile.top include ../makefile.defs +SIXTYFOURBIT = $(shell cd ../src; make -s echo-64bit) + ifeq ($(OS_NAME),windows) HOST = windows endif diff --git a/Makefile.alpha b/Makefile.alpha index 82e9e646..b00a7ebf 100644 --- a/Makefile.alpha +++ b/Makefile.alpha @@ -1,4 +1,4 @@ -# $Header: /repo/cvs.copy/clim2/Makefile.alpha,v 1.8 1999/02/25 08:23:21 layer Exp $ +# $Header: /repo/cvs.copy/clim2/Makefile.alpha,v 1.9 2000/03/04 05:13:48 duane Exp $ # # Makefile.alpha for CLIM 2.0 @@ -6,7 +6,12 @@ include Makefile.defs Makefile=Makefile.alpha +ifeq ($(SIXTYFOURBIT),yes) +CFLAGS = -O -G 0 -DAcl64Bit -resumption_safe +else CFLAGS = -O -G 0 -taso -xtaso -xtaso_short -resumption_safe +endif + STD_DEFINES = -DDEC -DR5_XLIB -DSMT AR = ar cqls @@ -20,6 +25,11 @@ PRODUCT-OBJS= $(PRODUCT-GENERIC-OBJS) $(STATIC-XM-OBJS) $(SHARED-XM-OBJS) PICFLAGS = SHAREFLAGS = + +ifeq ($(SIXTYFOURBIT),yes) +MAKE_SHARED = ../src/bin/make_shared.dec64 +else MAKE_SHARED = ../src/bin/make_shared.dec +endif include Makefile.generic diff --git a/tk/convenience.lisp b/tk/convenience.lisp index 3626e089..2ff84c6b 100644 --- a/tk/convenience.lisp +++ b/tk/convenience.lisp @@ -16,7 +16,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: convenience.lisp,v 1.22 1999/02/25 08:23:42 layer Exp $ +;; $Id: convenience.lisp,v 1.23 2000/03/04 05:13:48 duane Exp $ (in-package :tk) @@ -32,7 +32,7 @@ :call-direct t :arguments '(foreign-address foreign-address foreign-address fixnum) :arg-checking nil - :return-type :unsigned-integer)) + :return-type :foreign-address)) (defclass ,class ,superclasses () (:metaclass xt-class)) diff --git a/tk/font.lisp b/tk/font.lisp index 8916f761..4c0725c6 100644 --- a/tk/font.lisp +++ b/tk/font.lisp @@ -16,7 +16,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: font.lisp,v 1.23 1999/02/25 08:23:42 layer Exp $ +;; $Id: font.lisp,v 1.24 2000/03/04 05:13:48 duane Exp $ (in-package :tk) @@ -175,8 +175,8 @@ (missing-charsets nil)) (dotimes (i missing-count) (push (ff:char*-to-string - ;; needs work for 64bit machines - (sys:memref-int missing-list 0 (* i 4) :unsigned-long)) + (sys:memref-int missing-list 0 (* i #-64bit 4 #+64bit 8) + :unsigned-natural)) missing-charsets)) (values font-set missing-charsets (unless (zerop def-string) @@ -204,14 +204,12 @@ (fonts nil)) (dotimes (i n) (let ((name (ff:char*-to-string - ;; needs work for 64bit machines (sys:memref-int font-name-list-return - 0 (* i 4) :unsigned-long)))) + 0 (* i #-64bit 4 #+64bit 8) :unsigned-natural)))) (push (intern-object-address - ;; needs work for 64bit machines (sys:memref-int font-struct-list-return - 0 (* i 4) :unsigned-long) + 0 (* i #-64bit 4 #+64bit 8) :unsigned-natural) 'font :name name) fonts))) (nreverse fonts)))) @@ -241,6 +239,6 @@ (declare (ignore font-set)) ;; Generate a meaningful error message (error "~ -A non-ICS lisp that uses 7-bit characters does not support this operation.")) +A non-ICS lisp that uses 7-bit characters does not support this operation.")) )) ;; ics-target-case diff --git a/tk/resources.lisp b/tk/resources.lisp index 2f6159bd..c593a806 100644 --- a/tk/resources.lisp +++ b/tk/resources.lisp @@ -15,7 +15,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: resources.lisp,v 1.62 1999/02/25 08:23:42 layer Exp $ +;; $Id: resources.lisp,v 1.63 2000/03/04 05:13:48 duane Exp $ (in-package :tk) @@ -445,7 +445,7 @@ (int :signed-long) (boolean :unsigned-byte) (ol-define :unsigned-word) - (t :unsigned-long))) + (t :unsigned-natural))) (defun fill-gv-cache (parent-class class resources) @@ -461,7 +461,7 @@ ;; pointer but is really just the value. (dotimes (j len) (setf (xt-arglist-value arglist j) - (clim-utils::allocate-memory 8 0))) + (clim-utils::allocate-memory 8 0))) (dolist (r resources) (let ((resource (or (find-class-resource class r) (psetq constraint-resource-used t) @@ -601,10 +601,10 @@ (defmethod convert-resource-out ((parent t) (type (eql 'string)) value) (note-malloced-object (excl:ics-target-case - (:+ics - ;; JPM 1/99. We know this EUC stuff is wrong for two reasons: + (:+ics + ;; JPM 1/99. We know this EUC stuff is wrong for two reasons: ;; 1. We free everything with SYSTEM-FREE, which can't free - ;; things created via excl:aclmalloc. Therefore, + ;; things created via excl:aclmalloc. Therefore, ;; EUC-TO-CHAR* is not viable in CLIM. You'll get SEGV on Linux. ;; 2. It doesn't handle Japanese character sets correctly anyway. ;; Contrast with the convert-resource-out method for diff --git a/tk/xlib.lisp b/tk/xlib.lisp index b5e6b813..c587a95d 100644 --- a/tk/xlib.lisp +++ b/tk/xlib.lisp @@ -15,7 +15,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: xlib.lisp,v 1.63 1999/02/25 08:23:42 layer Exp $ +;; $Id: xlib.lisp,v 1.64 2000/03/04 05:13:49 duane Exp $ (in-package :tk) @@ -208,7 +208,7 @@ (char*-to-string (x11:xrmvalue-addr xrmvalue))) ((equal type "Pixel") (sys::memref-int (x11:xrmvalue-addr xrmvalue) 0 0 - :unsigned-long)) + :unsigned-natural)) (t (error "Unknown resource type: ~A" type))) type)))))) @@ -351,7 +351,7 @@ (defun make-xcolor (&key in-foreign-space (number 1)) (declare (ignore in-foreign-space)) - (clim-utils::allocate-cstruct 'x11::xcolor + (clim-utils::allocate-cstruct 'x11::xcolor :number number :initialize t)) (defmethod initialize-instance :after @@ -412,7 +412,7 @@ (if (zerop z) (error 'x-colormap-full) (values (x11:xcolor-pixel y) - (make-instance 'color + (make-instance 'color :in-foreign-space t :foreign-address y)))))) @@ -479,27 +479,27 @@ (defun make-xcolor-array (&key (number 1) in-foreign-space (initialize t)) (declare (ignore in-foreign-space)) - (clim-utils::allocate-cstruct 'x11::xcolor-array + (clim-utils::allocate-cstruct 'x11::xcolor-array :number number :initialize initialize)) (defun make-xsegment-array (&key (number 1) in-foreign-space (initialize t)) (declare (ignore in-foreign-space)) - (clim-utils::allocate-cstruct 'x11::xsegment-array + (clim-utils::allocate-cstruct 'x11::xsegment-array :number number :initialize initialize)) (defun make-xpoint-array (&key (number 1) in-foreign-space (initialize t)) (declare (ignore in-foreign-space)) - (clim-utils::allocate-cstruct 'x11::xpoint-array + (clim-utils::allocate-cstruct 'x11::xpoint-array :number number :initialize initialize)) (defun make-xrectangle-array (&key (number 1) in-foreign-space (initialize t)) (declare (ignore in-foreign-space)) - (clim-utils::allocate-cstruct 'x11::xrectangle-array + (clim-utils::allocate-cstruct 'x11::xrectangle-array :number number :initialize initialize)) (defun make-xarc-array (&key (number 1) in-foreign-space (initialize t)) (declare (ignore in-foreign-space)) - (clim-utils::allocate-cstruct 'x11::xarc-array + (clim-utils::allocate-cstruct 'x11::xarc-array :number number :initialize initialize)) (def-foreign-array-resource xcolor-array make-xcolor-array) diff --git a/tk/xm-funs.lisp b/tk/xm-funs.lisp index 9bce8caa..a2c49922 100644 --- a/tk/xm-funs.lisp +++ b/tk/xm-funs.lisp @@ -15,7 +15,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: xm-funs.lisp,v 1.21 1998/08/06 23:17:20 layer Exp $ +;; $Id: xm-funs.lisp,v 1.22 2000/03/04 05:13:49 duane Exp $ ;; ;; This file contains compile time only code -- put in clim-debug.fasl. @@ -28,21 +28,21 @@ :call-direct t :callback nil :arguments '(foreign-address foreign-address) - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_string_concat :entry-point (ff:convert-to-lang "XmStringConcat") :call-direct t :callback nil :arguments '(foreign-address foreign-address) - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_string_copy :entry-point (ff:convert-to-lang "XmStringCopy") :call-direct t :callback nil :arguments '(foreign-address) - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_string_get_l_to_r :entry-point (ff:convert-to-lang "XmStringGetLtoR") @@ -57,7 +57,7 @@ :call-direct t :arguments '(foreign-address foreign-address integer integer) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_font_list_init_font_context :entry-point (ff:convert-to-lang "XmFontListInitFontContext") @@ -89,7 +89,7 @@ :callback nil :arguments '(foreign-address foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_font_list_free :entry-point (ff:convert-to-lang "XmFontListFree") @@ -120,7 +120,7 @@ :callback nil :arguments '(foreign-address foreign-address fixnum) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_main_window_set_area :entry-point (ff:convert-to-lang "XmMainWindowSetAreas") @@ -142,14 +142,14 @@ :call-direct t :arguments '(foreign-address fixnum) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm-selection-box-get-child :entry-point (ff:convert-to-lang "XmSelectionBoxGetChild") :call-direct t :arguments '(foreign-address fixnum) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_file_selection_do_search @@ -164,14 +164,14 @@ :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_option_button_gadget :entry-point (ff:convert-to-lang "XmOptionButtonGadget") :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'initializemydrawingareaquerygeometry :entry-point (ff:convert-to-lang "InitializeMyDrawingAreaQueryGeometry") @@ -186,14 +186,14 @@ :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_is_traversable :entry-point (ff:convert-to-lang "XmIsTraversable") :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_font_list_append_entry :entry-point (ff:convert-to-lang "XmFontListAppendEntry") @@ -201,7 +201,7 @@ :callback nil :arguments '(foreign-address foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_font_list_entry_create :entry-point (ff:convert-to-lang "XmFontListEntryCreate") @@ -209,7 +209,7 @@ :callback nil :arguments '(foreign-address foreign-address foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_font_list_entry_get_font :entry-point (ff:convert-to-lang "XmFontListEntryGetFont") @@ -217,7 +217,7 @@ :callback nil :arguments '(foreign-address foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_font_list_next_entry :entry-point (ff:convert-to-lang "XmFontListNextEntry") @@ -225,7 +225,7 @@ :callback nil :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xm_toggle_button_set_state :entry-point (ff:convert-to-lang "XmToggleButtonSetState") diff --git a/tk/xt-funs.lisp b/tk/xt-funs.lisp index f7d473a6..8fee955f 100644 --- a/tk/xt-funs.lisp +++ b/tk/xt-funs.lisp @@ -15,7 +15,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: xt-funs.lisp,v 1.31 1998/08/06 23:17:21 layer Exp $ +;; $Id: xt-funs.lisp,v 1.32 2000/03/04 05:13:49 duane Exp $ ;; ;; This file contains compile time only code -- put in clim-debug.fasl. @@ -66,14 +66,14 @@ :call-direct t :arguments nil :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_destroy_application_context :entry-point (ff:convert-to-lang "XtDestroyApplicationContext") :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_app_set_error_handler :entry-point (ff:convert-to-lang "XtAppSetErrorHandler") @@ -95,28 +95,28 @@ :arguments '(foreign-address foreign-address foreign-address foreign-address foreign-address fixnum foreign-address foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_close_display :entry-point (ff:convert-to-lang "XtCloseDisplay") :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_database :entry-point (ff:convert-to-lang "XtDatabase") :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_get_application_name_and_class :entry-point (ff:convert-to-lang "XtGetApplicationNameAndClass") :call-direct t :arguments '(foreign-address foreign-address foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_convert_and_store @@ -125,7 +125,7 @@ :arguments '(foreign-address foreign-address foreign-address foreign-address foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_app_create_shell :entry-point (ff:convert-to-lang "XtAppCreateShell") @@ -133,7 +133,7 @@ :arguments '(foreign-address foreign-address foreign-address foreign-address foreign-address fixnum) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) ;;;; @@ -143,7 +143,7 @@ :arguments '(foreign-address foreign-address foreign-address foreign-address fixnum) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_create_managed_widget @@ -152,7 +152,7 @@ :arguments '(foreign-address foreign-address foreign-address foreign-address fixnum) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_realize_widget :entry-point (ff:convert-to-lang "XtRealizeWidget") @@ -216,7 +216,7 @@ :call-direct t :arguments '(foreign-address foreign-address foreign-address foreign-address fixnum) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_popup :entry-point (ff:convert-to-lang "XtPopup") @@ -237,35 +237,35 @@ :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_parent :entry-point (ff:convert-to-lang "XtParent") :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_name :entry-point (ff:convert-to-lang "XtName") :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_class :entry-point (ff:convert-to-lang "XtClass") :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_query_geometry :entry-point (ff:convert-to-lang "XtQueryGeometry") :call-direct t :arguments '(foreign-address foreign-address foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_configure_widget :entry-point (ff:convert-to-lang "XtConfigureWidget") @@ -332,7 +332,7 @@ :call-direct t :arguments '(foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_add_callback :entry-point (ff:convert-to-lang "XtAddCallback") @@ -346,7 +346,7 @@ :call-direct t :arguments '(foreign-address foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_remove_all_callbacks :entry-point (ff:convert-to-lang "XtRemoveAllCallbacks") @@ -402,49 +402,49 @@ :arguments '(foreign-address ; display ) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (defforeign 'xt_set_keyboard_focus :entry-point (ff:convert-to-lang "XtSetKeyboardFocus") :call-direct t :arguments '(foreign-address foreign-address) :arg-checking nil - :return-type :unsigned-integer) + :return-type :foreign-address) (ff:defforeign 'init_clim_gc_cursor_stuff :call-direct t :arguments '(foreign-address) :arg-checking nil :entry-point (ff:convert-to-lang "init_clim_gc_cursor_stuff") - :return-type :unsigned-integer) + :return-type :foreign-address) (ff:defforeign 'set_clim_gc_cursor_widget :call-direct t :arguments '(foreign-address integer) :arg-checking nil :entry-point (ff:convert-to-lang "set_clim_gc_cursor_widget") - :return-type :unsigned-integer) + :return-type :foreign-address) ;(ff:defforeign 'xt_get_multi_click_time ; :call-direct t ; :arguments '(foreign-address) ; :arg-checking nil ; :entry-point (ff:convert-to-lang "XtGetMultiClickTime") -; :return-type :unsigned-integer) +; :return-type :foreign-address) (ff:defforeign 'xt_parse_translation_table :call-direct t :arguments '(simple-string) :arg-checking nil :entry-point (ff:convert-to-lang "XtParseTranslationTable") - :return-type :unsigned-integer) + :return-type :foreign-address) (ff:defforeign 'xt_parse_accelerator_table :call-direct t :arguments '(simple-string) :arg-checking nil :entry-point (ff:convert-to-lang "XtParseAcceleratorTable") - :return-type :unsigned-integer) + :return-type :foreign-address) (ff:defforeign 'xt_app_set_fallback_resources :call-direct t @@ -475,7 +475,7 @@ :arg-checking nil :entry-point (ff:convert-to-lang "setlocale") :arguments '(integer integer) - :return-type :unsigned-integer) + :return-type :foreign-address) #+debug (progn @@ -485,14 +485,14 @@ :arguments nil :arg-checking nil :entry-point (ff:convert-to-lang "_XlcCurrentLC") - :return-type :unsigned-integer) + :return-type :foreign-address) (ff:defforeign 'init-font-set :call-direct t :arguments '(foreign-address) :arg-checking nil :entry-point (ff:convert-to-lang "initFontSet") - :return-type :unsigned-integer) + :return-type :foreign-address) (ff:defforeign 'islower @@ -500,7 +500,7 @@ :arguments '(foreign-address) :arg-checking nil :entry-point (ff:convert-to-lang "islower") - :return-type :unsigned-integer) + :return-type :foreign-address) (ff:defforeign 'toupper @@ -508,6 +508,6 @@ :arguments '(foreign-address) :arg-checking nil :entry-point (ff:convert-to-lang "toupper") - :return-type :unsigned-integer) + :return-type :foreign-address) ) ;;progn diff --git a/utils/lisp-utilities.lisp b/utils/lisp-utilities.lisp index dc40ddf6..d90d87e4 100644 --- a/utils/lisp-utilities.lisp +++ b/utils/lisp-utilities.lisp @@ -16,7 +16,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: lisp-utilities.lisp,v 1.42 2000/02/26 01:09:59 cox Exp $ +;; $Id: lisp-utilities.lisp,v 1.43 2000/03/04 05:13:51 duane Exp $ (in-package :clim-utils) @@ -1593,7 +1593,7 @@ ((data :int)) :call-direct t :arg-checking nil - :returning :int) + :returning :foreign-address) (ff:def-foreign-call (_free "free") ((data (* :char))) :call-direct t @@ -1607,7 +1607,7 @@ ;;; ALLOCATE-CSTRUCT was adapted from ff:make-cstruct. ;;; We aren't using ff:make-cstruct because it uses excl:aclmalloc. #-mswindows -(defun allocate-cstruct (name &key +(defun allocate-cstruct (name &key (number 1) (initialize (ff::cstruct-property-initialize @@ -1623,13 +1623,13 @@ ;; Used only by ALLOCATE-CSTRUCT. (let ((pointer (_malloc size))) (when init - (do ((i 0 (+ i 4))) + (do ((i 0 (+ i #-64bit 4 #+64bit 8))) ((>= i size)) (declare (fixnum i)) - (setf (sys:memref-int pointer i 0 :unsigned-long) 0))) + (setf (sys:memref-int pointer i 0 :unsigned-natural) 0))) pointer)) -;; Adapted from FF:STRING-TO-CHAR*. +;; Adapted from FF:STRING-TO-CHAR*. ;;; We aren't using FF:STRING-TO-CHAR* because it uses excl:aclmalloc. (defun string-to-foreign (string &optional address) "Convert a Lisp string to a C string, by copying." diff --git a/utils/packages.lisp b/utils/packages.lisp index 7ab742aa..da84adcb 100644 --- a/utils/packages.lisp +++ b/utils/packages.lisp @@ -16,7 +16,7 @@ ;; Commercial Software developed at private expense as specified in ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable. ;; -;; $Id: packages.lisp,v 1.92 1999/07/19 22:25:21 layer Exp $ +;; $Id: packages.lisp,v 1.93 2000/03/04 05:13:51 duane Exp $ (in-package :common-lisp-user) @@ -2371,7 +2371,7 @@ frame-manager-frames frame-manager-notify-user frame-manager-pointer-documentation-stream - frame-manager-print-file ; jpm + frame-manager-print-file ; jpm frame-manager-select-file frame-name frame-named-panes @@ -3294,7 +3294,7 @@ (cl:defvar *clim-major-version* 2) (cl:defvar *clim-minor-version* 2) (cl:defvar *clim-generation-version* 2) -(cl:defvar *clim-build-version* 7) +(cl:defvar *clim-build-version* 8) (cl:defparameter *clim-version* (cl:format () "~d.~d.~d.~a" diff --git a/wnn/jl-funs.lisp b/wnn/jl-funs.lisp index a4a3038b..b6ad5ba5 100644 --- a/wnn/jl-funs.lisp +++ b/wnn/jl-funs.lisp @@ -1,6 +1,6 @@ ;; -*- mode: common-lisp; package: wnn -*- ;; -;; -[Mon Jul 6 15:35:41 1998 by layer]- +;; -[Fri Dec 3 23:34:30 1999 by duane]- ;; ;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved. ;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved. @@ -20,21 +20,21 @@ ;; 52.227-19 or DOD FAR Supplement 252.227-7013 (c) (1) (ii), as ;; applicable. ;; -;; $Id: jl-funs.lisp,v 1.4 1998/08/06 23:17:41 layer Exp $ +;; $Id: jl-funs.lisp,v 1.5 2000/03/04 05:13:53 duane Exp $ (in-package :wnn) (defforeign 'jl_open_lang :arguments '(foreign-address foreign-address foreign-address integer integer integer integer) - :return-type :unsigned-integer + :return-type :foreign-address :call-direct t :arg-checking nil) (defforeign 'jl_connect_lang :arguments '(foreign-address foreign-address foreign-address integer integer integer integer) - :return-type :unsigned-integer + :return-type :foreign-address :call-direct t :arg-checking nil) @@ -46,7 +46,7 @@ (defforeign 'jl_env_get :arguments '(foreign-address) - :return-type :unsigned-integer + :return-type :foreign-address :call-direct t :arg-checking nil) -- GitLab