Skip to content
Snippets Groups Projects
Commit 6bf938c6 authored by duane's avatar duane
Browse files

See 2.2.1.7 changelog entry for Sat Feb 28 15:18:45 1998

parent 368efcb8
No related branches found
No related tags found
No related merge requests found
......@@ -10,6 +10,18 @@ Tests for new features: <`no new features', `no tests for new features', or
<standard changelog date stamp>
* <changes go here...>
*******************************************************************************
2.2.1.7
Sat Feb 28 15:18:45 1998 Duane Rettig <duane@beta>
* Makefile.rs6000: Fix bug in rs/6000
* tk/xt-funs.lisp: Fix bug in rs/6000
* tk-silica/gc-cursor.lisp: Conform gc hooks to new style
*******************************************************************************
2.2.1.6 (merge from 2.2.1.5 branch)
......
# $Header: /repo/cvs.copy/clim2/Makefile.rs6000,v 1.8 1997/10/20 23:10:57 layer Exp $
# $Header: /repo/cvs.copy/clim2/Makefile.rs6000,v 1.9 1998/03/02 23:17:03 duane Exp $
#
# Makefile.rs6000 for CLIM 2.0
#
......@@ -22,7 +22,7 @@ AR = ar clq
# This should be defined in make-dist. For CLIM devel (ie making
# slim images) we use climdcl-devel and don't use the shared library
# IMPORTS = ../src/ucl.exp
IMPORTS = stub-x.o stub-xt.o stub-motif.o ../src/lisp.exp
stubs = c2stubs
......
;; -*- mode: common-lisp; package: xm-silica -*-
;;
;; -[Fri Nov 11 15:11:52 1994 by smh]-
;; -[Mon Feb 23 12:17:13 1998 by duane]-
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved.
......@@ -19,7 +19,7 @@
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $Header: /repo/cvs.copy/clim2/tk-silica/gc-cursor.lisp,v 1.7 1997/02/05 01:53:45 tomj Exp $
;; $Header: /repo/cvs.copy/clim2/tk-silica/gc-cursor.lisp,v 1.8 1998/03/02 23:17:04 duane Exp $
(in-package :xm-silica)
......@@ -31,13 +31,21 @@
(defun init-gc-cursor (frame)
(when *use-clim-gc-cursor*
(unless *gc-before* ; Do just once.
(let ((vec (vector nil nil)))
(let ((vec (if* (fboundp 'excl::gc-before-c-hooks) ;; The new style
then (make-array 2 :element-type '(unsigned-byte 32))
else (vector nil nil))))
(tk::init_clim_gc_cursor_stuff vec)
(setq *gc-before* (svref vec 0)
*gc-after* (svref vec 1))
(pushnew *gc-before* (excl::gc-before-hooks))
(pushnew *gc-after* (excl::gc-after-hooks))
))
(if* (fboundp 'excl::gc-before-c-hooks)
then (pushnew (make-array 1 :element-type '(unsigned-byte 32)
:initial-element *gc-before*)
(excl:gc-before-c-hooks))
(pushnew (make-array 1 :element-type '(unsigned-byte 32)
:initial-element *gc-after*)
(excl:gc-after-c-hooks))
else (pushnew *gc-before* (excl::gc-before-hooks))
(pushnew *gc-after* (excl::gc-after-hooks)))))
(let* ((sheet (frame-top-level-sheet frame))
(mirror (and sheet (sheet-direct-mirror sheet))))
(if mirror
......
;; -*- mode: common-lisp; package: xt -*-
;;
;; -[Thu Nov 10 19:28:13 1994 by smh]-
;; -[Thu Feb 26 15:05:28 1998 by duane]-
;;
;; copyright (c) 1985, 1986 Franz Inc, Alameda, CA All rights reserved.
;; copyright (c) 1986-1992 Franz Inc, Berkeley, CA All rights reserved.
......@@ -19,7 +19,7 @@
;; Commercial Software developed at private expense as specified in
;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
;;
;; $Header: /repo/cvs.copy/clim2/tk/xt-funs.lisp,v 1.29 1997/02/05 01:53:29 tomj Exp $
;; $Header: /repo/cvs.copy/clim2/tk/xt-funs.lisp,v 1.30 1998/03/02 23:17:04 duane Exp $
;;
......@@ -58,7 +58,9 @@
:return-type :void)
(defforeign 'xt_toolkit_initialize
:entry-point (ff:convert-to-lang "XtToolkitInitialize")
:entry-point (ff:convert-to-lang
#-rs6000 "XtToolkitInitialize"
#+rs6000 "_XtToolkitInitialize")
:call-direct t
:arguments nil
:arg-checking nil
......
;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Package: CL-USER; Base: 10; Lowercase: Yes -*-
;; $Header: /repo/cvs.copy/clim2/utils/packages.lisp,v 1.78 1998/02/13 21:04:47 layer Exp $
;; $Header: /repo/cvs.copy/clim2/utils/packages.lisp,v 1.79 1998/03/02 23:17:04 duane Exp $
(in-package :common-lisp-user)
......@@ -3301,7 +3301,7 @@
(cl:defvar *clim-major-version* 2)
(cl:defvar *clim-minor-version* 2)
(cl:defvar *clim-generation-version* 1)
(cl:defvar *clim-build-version* 6)
(cl:defvar *clim-build-version* 7)
(cl:defparameter *clim-version*
(cl:format () "CLIM ~d.~d.~d.~a"
......@@ -3309,4 +3309,4 @@
*clim-generation-version* *clim-build-version*))
#-aclpc
(si::rcsnote *clim-version* "$Id: packages.lisp,v 1.78 1998/02/13 21:04:47 layer Exp $")
(si::rcsnote *clim-version* "$Id: packages.lisp,v 1.79 1998/03/02 23:17:04 duane Exp $")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment