From cec2a6e0eb039f1fffc51a69dda5713dce7cf271 Mon Sep 17 00:00:00 2001
From: layer <layer>
Date: Fri, 3 Feb 2006 18:25:41 +0000
Subject: [PATCH] 2006-02-03    <layer@HOBART64>

---
 ChangeLog.n           | 12 +++++++++++-
 clim/menus.lisp       |  4 ++--
 demo/demo-driver.lisp |  6 +++---
 misc/compile-1.lisp   |  4 ++--
 silica/port.lisp      |  6 +++---
 sys/compile.lisp      |  6 +++---
 sys/load.lisp         |  4 ++--
 7 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/ChangeLog.n b/ChangeLog.n
index a78a0766..8547f021 100644
--- a/ChangeLog.n
+++ b/ChangeLog.n
@@ -1,3 +1,13 @@
+2006-02-03    <layer@HOBART64>
+
+    for 64-bit windows (changing all microsft-32's to microsoft's)
+	* clim2/clim/menus.lisp: 
+	* clim2/demo/demo-driver.lisp: 
+	* clim2/misc/compile-1.lisp: 
+	* clim2/silica/port.lisp: 
+	* clim2/sys/compile.lisp: 
+	* clim2/sys/load.lisp: 
+
 2005-12-01  Arthur Lemmens  <alemmens@xs4all.nl>
 
     Arthur will fill this in...
@@ -5995,4 +6005,4 @@ IGNORE JDI SPECIFIC CHANGES TO Makefile
 	Lots of other stuff
 
 *******************************************************************************
-$Revision: 2.12 $
+$Revision: 2.13 $
diff --git a/clim/menus.lisp b/clim/menus.lisp
index 2207f1a8..032f905d 100644
--- a/clim/menus.lisp
+++ b/clim/menus.lisp
@@ -17,7 +17,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: menus.lisp,v 2.6 2005/12/08 21:25:43 layer Exp $
+;; $Id: menus.lisp,v 2.7 2006/02/03 18:25:40 layer Exp $
 
 (in-package :clim-internals)
 
@@ -87,7 +87,7 @@
                            (eq (not label) (not (menu-frame-label (pane-frame menu))))
                            (eq (frame-manager menu) (frame-manager root))
 			   
-			   #+microsoft-32 ; frames don't work across threads
+			   #+microsoft	; frames don't work across threads
 			   (eq (current-process) (sheet-thread
 						  (frame-top-level-sheet
 						   (pane-frame menu))))			   
diff --git a/demo/demo-driver.lisp b/demo/demo-driver.lisp
index b020c297..52f80b01 100644
--- a/demo/demo-driver.lisp
+++ b/demo/demo-driver.lisp
@@ -17,7 +17,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: demo-driver.lisp,v 2.6 2005/12/08 21:25:44 layer Exp $
+;; $Id: demo-driver.lisp,v 2.7 2006/02/03 18:25:40 layer Exp $
 
 (in-package :clim-demo)
 
@@ -92,7 +92,7 @@
   (run-demo demo :port (port *application-frame*) :force t :background t))
 
 (defun run-demo (demo &key (port (find-port)) force background)
-  #+(and os-threads microsoft-32)
+  #+(and os-threads microsoft)
   (setq force t)
   (flet ((do-it ()
 	   (let* ((entry (assoc port (demo-frames demo)))
@@ -132,7 +132,7 @@
 	:name "Demo Driver" :class 'demo-driver
 	:initargs '(:left 0 :top 0))))
   (run-demo *demo-frame* :port port :background background :force force)
-  #+(and os-threads microsoft-32)
+  #+(and os-threads microsoft)
   (setq *demo-frame* nil)
   )
 
diff --git a/misc/compile-1.lisp b/misc/compile-1.lisp
index 972fc18f..eb8f2523 100644
--- a/misc/compile-1.lisp
+++ b/misc/compile-1.lisp
@@ -18,7 +18,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: compile-1.lisp,v 2.6 2005/12/08 21:25:45 layer Exp $
+;; $Id: compile-1.lisp,v 2.7 2006/02/03 18:25:40 layer Exp $
 
 (in-package :user)
 
@@ -28,7 +28,7 @@
 ;; Forgive them, lord, for they know not what they do.
 (pushnew :ansi-90 *features*)
 
-#+(and allegro microsoft-32)
+#+(and allegro microsoft)
 (eval-when (compile load eval) 
   (pushnew :acl86win32 *features*))
 
diff --git a/silica/port.lisp b/silica/port.lisp
index 122992b3..c609e29f 100644
--- a/silica/port.lisp
+++ b/silica/port.lisp
@@ -17,7 +17,7 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: port.lisp,v 2.6 2005/12/08 21:25:46 layer Exp $
+;; $Id: port.lisp,v 2.7 2006/02/03 18:25:41 layer Exp $
 
 (in-package :silica)
 
@@ -27,11 +27,11 @@
 
 ;; Ports and grafts
 
-(defvar *default-server-path* #+(and allegro (not microsoft-32)) '(:motif)
+(defvar *default-server-path* #+(and allegro (not microsoft)) '(:motif)
                               #+Lucid '(:clx)
                               #+Genera `(:genera)
                               #+Cloe-Runtime `(:cloe)
-                              #+(and allegro microsoft-32) '(:aclpc)
+                              #+(and allegro microsoft) '(:aclpc)
                               #-(or allegro Lucid Genera Cloe-Runtime) nil)
 
 
diff --git a/sys/compile.lisp b/sys/compile.lisp
index 6132060c..4e54d976 100644
--- a/sys/compile.lisp
+++ b/sys/compile.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: compile.lisp,v 2.6 2005/12/08 21:25:46 layer Exp $
+;; $Id: compile.lisp,v 2.7 2006/02/03 18:25:41 layer Exp $
 
 (in-package :user)
 
@@ -26,11 +26,11 @@
 
 (proclaim '(optimize (speed 3) (safety 1) (debug 1)))
 
-#+(and allegro microsoft-32)
+#+(and allegro microsoft)
 (eval-when (compile load eval) 
   (pushnew :acl86win32 *features*))
 
-#+microsoft-32
+#+microsoft
 (let ((excl::*enable-package-locked-errors* nil))
   (when (not (fboundp 'system::rcsnote))
     (defun system::rcsnote (&rest args)
diff --git a/sys/load.lisp b/sys/load.lisp
index 6c81b6a0..c87d4f09 100644
--- a/sys/load.lisp
+++ b/sys/load.lisp
@@ -16,11 +16,11 @@
 ;; Commercial Software developed at private expense as specified in
 ;; DOD FAR Supplement 52.227-7013 (c) (1) (ii), as applicable.
 ;;
-;; $Id: load.lisp,v 2.6 2005/12/08 21:25:46 layer Exp $
+;; $Id: load.lisp,v 2.7 2006/02/03 18:25:41 layer Exp $
 
 (in-package :user)
 
-#+(and Allegro (or microsoft-32 mswindows))
+#+(and Allegro (or microsoft mswindows))
 (eval-when (compile load eval) (push :acl86win32 *features*))
 
 #+acl86win32
-- 
GitLab