From 564d298d4bee4b024deb9f572a4365f782d81e25 Mon Sep 17 00:00:00 2001
From: Martin Schaffner <schaffnerb@gmx.ch>
Date: Mon, 24 Jan 2005 22:19:10 +0000
Subject: [PATCH] include u_mem.h and pstypes.h instead of d1-style mem.h and
 types.h

---
 ChangeLog     | 6 ++++++
 ui/barbox.c   | 6 +++---
 ui/button.c   | 8 ++++----
 ui/checkbox.c | 8 ++++----
 ui/file.c     | 8 ++++----
 ui/gadget.c   | 8 ++++----
 ui/icon.c     | 8 ++++----
 ui/inputbox.c | 8 ++++----
 ui/keypad.c   | 6 +++---
 ui/keypress.c | 6 +++---
 ui/keytrap.c  | 4 ++--
 ui/listbox.c  | 6 +++---
 ui/menu.c     | 8 ++++----
 ui/menubar.c  | 8 ++++----
 ui/message.c  | 6 +++---
 ui/mouse.c    | 8 ++++----
 ui/number.c   | 6 +++---
 ui/popup.c    | 6 +++---
 ui/radio.c    | 6 +++---
 ui/scroll.c   | 6 +++---
 ui/ui.c       | 6 +++---
 ui/uidraw.c   | 6 +++---
 ui/userbox.c  | 6 +++---
 ui/window.c   | 8 ++++----
 24 files changed, 84 insertions(+), 78 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4dcdbd78..b4f5578c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,12 @@
 	* main/editor/macro.c: remove unused variable "length"
 	* main/editor/med.c: don't set screen mode to SM_ORIGINAL
 	* main/editor/medmisc.c: Pass both arguments to render_frame
+	* ui/barbox.c, ui/button.c, ui/checkbox.c, ui/file.c, ui/gadget.c,
+	ui/icon.c, ui/inputbox.c, ui/keypad.c, ui/keypress.c, ui/keytrap.c,
+	ui/listbox.c, ui/menu.c, ui/menubar.c, ui/message.c, ui/mouse.c,
+	ui/number.c, ui/popup.c, ui/radio.c, ui/scroll.c, ui/ui.c,
+	ui/uidraw.c, ui/userbox.c, ui/window.c: include u_mem.h and pstypes.h
+	instead of d1-style mem.h and types.h
 
 2005-01-23  Jason Owen  <shannara256@yahoo.com>
 
diff --git a/ui/barbox.c b/ui/barbox.c
index 63d33cda..623754c0 100644
--- a/ui/barbox.c
+++ b/ui/barbox.c
@@ -1,4 +1,4 @@
-/* $Id: barbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: barbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: barbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: barbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: barbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <stdarg.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/button.c b/ui/button.c
index 1d4aed52..5764691e 100644
--- a/ui/button.c
+++ b/ui/button.c
@@ -1,4 +1,4 @@
-/* $Id: button.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: button.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: button.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: button.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -23,9 +23,9 @@ static char rcsid[] = "$Id: button.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <stdlib.h>
 #include <string.h>
 
-#include "mem.h"
+#include "u_mem.h"
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/checkbox.c b/ui/checkbox.c
index d69cba27..7e9f75ad 100644
--- a/ui/checkbox.c
+++ b/ui/checkbox.c
@@ -1,4 +1,4 @@
-/* $Id: checkbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: checkbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: checkbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: checkbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -23,9 +23,9 @@ static char rcsid[] = "$Id: checkbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <stdlib.h>
 #include <string.h>
 
-#include "mem.h"
+#include "u_mem.h"
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/file.c b/ui/file.c
index efe7b5ca..3963cc27 100644
--- a/ui/file.c
+++ b/ui/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: file.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: file.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: file.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #include <stdio.h>
@@ -29,14 +29,14 @@ static char rcsid[] = "$Id: file.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <sys\stat.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "key.h"
 
 #include "ui.h"
 #include "mono.h"
 
-#include "mem.h"
+#include "u_mem.h"
 
 #define TICKER (*(volatile int *)0x46C)
 
diff --git a/ui/gadget.c b/ui/gadget.c
index d705c2d6..3f698398 100644
--- a/ui/gadget.c
+++ b/ui/gadget.c
@@ -1,4 +1,4 @@
-/* $Id: gadget.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: gadget.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: gadget.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: gadget.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -23,9 +23,9 @@ static char rcsid[] = "$Id: gadget.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "mem.h"
+#include "u_mem.h"
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 
diff --git a/ui/icon.c b/ui/icon.c
index 57395598..78feddc3 100644
--- a/ui/icon.c
+++ b/ui/icon.c
@@ -1,4 +1,4 @@
-/* $Id: icon.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: icon.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: icon.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: icon.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -23,9 +23,9 @@ static char rcsid[] = "$Id: icon.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <stdlib.h>
 #include <string.h>
 
-#include "mem.h"
+#include "u_mem.h"
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/inputbox.c b/ui/inputbox.c
index 0b3d31fb..1775ef8d 100644
--- a/ui/inputbox.c
+++ b/ui/inputbox.c
@@ -1,4 +1,4 @@
-/* $Id: inputbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: inputbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: inputbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: inputbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -23,9 +23,9 @@ static char rcsid[] = "$Id: inputbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <stdlib.h>
 #include <string.h>
 
-#include "mem.h"
+#include "u_mem.h"
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/keypad.c b/ui/keypad.c
index 3fe03293..f9afb6d1 100644
--- a/ui/keypad.c
+++ b/ui/keypad.c
@@ -1,4 +1,4 @@
-/* $Id: keypad.c,v 1.2 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: keypad.c,v 1.3 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -26,7 +26,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "key.h"
 
@@ -34,7 +34,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #include "ui.h"
 
-#include "mem.h"
+#include "u_mem.h"
 //#include "cflib.h"
 #include "func.h"
 #include "error.h"
diff --git a/ui/keypress.c b/ui/keypress.c
index f019b379..33950f5b 100644
--- a/ui/keypress.c
+++ b/ui/keypress.c
@@ -1,4 +1,4 @@
-/* $Id: keypress.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: keypress.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: keypress.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: keypress.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -25,7 +25,7 @@ static char rcsid[] = "$Id: keypress.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <string.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/keytrap.c b/ui/keytrap.c
index 7756786c..f89d6f2e 100644
--- a/ui/keytrap.c
+++ b/ui/keytrap.c
@@ -1,4 +1,4 @@
-/* $Id: keytrap.c,v 1.2 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: keytrap.c,v 1.3 2005-01-24 22:19:10 schaffner Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "conf.h"
@@ -8,7 +8,7 @@
 #include <string.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/listbox.c b/ui/listbox.c
index e348539c..f30a37f6 100644
--- a/ui/listbox.c
+++ b/ui/listbox.c
@@ -1,4 +1,4 @@
-/* $Id: listbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: listbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: listbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: listbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -23,7 +23,7 @@ static char rcsid[] = "$Id: listbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <stdlib.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/menu.c b/ui/menu.c
index 40cc327c..8c11c239 100644
--- a/ui/menu.c
+++ b/ui/menu.c
@@ -1,4 +1,4 @@
-/* $Id: menu.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: menu.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: menu.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: menu.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -22,9 +22,9 @@ static char rcsid[] = "$Id: menu.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 
 #include <stdlib.h>
 
-#include "mem.h"
+#include "u_mem.h"
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 
diff --git a/ui/menubar.c b/ui/menubar.c
index e7cf1072..900eff80 100644
--- a/ui/menubar.c
+++ b/ui/menubar.c
@@ -1,4 +1,4 @@
-/* $Id: menubar.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: menubar.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: menubar.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: menubar.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -25,9 +25,9 @@ static char rcsid[] = "$Id: menubar.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <string.h>
 #include <ctype.h>
 
-#include "mem.h"
+#include "u_mem.h"
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/message.c b/ui/message.c
index fa4ffce0..32ea494f 100644
--- a/ui/message.c
+++ b/ui/message.c
@@ -1,4 +1,4 @@
-/* $Id: message.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: message.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: message.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: message.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: message.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <stdarg.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/mouse.c b/ui/mouse.c
index 0b33c16f..4e148ca1 100644
--- a/ui/mouse.c
+++ b/ui/mouse.c
@@ -1,4 +1,4 @@
-/* $Id: mouse.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: mouse.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: mouse.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: mouse.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -22,9 +22,9 @@ static char rcsid[] = "$Id: mouse.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 
 #include <stdlib.h>
 
-#include "mem.h"
+#include "u_mem.h"
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "mouse.h"
 
diff --git a/ui/number.c b/ui/number.c
index 2dea9f52..da45a531 100644
--- a/ui/number.c
+++ b/ui/number.c
@@ -1,4 +1,4 @@
-/* $Id: number.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: number.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: number.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: number.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: number.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <stdarg.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 
diff --git a/ui/popup.c b/ui/popup.c
index a26f3032..d7f0cae6 100644
--- a/ui/popup.c
+++ b/ui/popup.c
@@ -1,4 +1,4 @@
-/* $Id: popup.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: popup.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: popup.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: popup.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -21,7 +21,7 @@ static char rcsid[] = "$Id: popup.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #endif
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "mouse.h"
diff --git a/ui/radio.c b/ui/radio.c
index abfcabc1..857ae645 100644
--- a/ui/radio.c
+++ b/ui/radio.c
@@ -1,4 +1,4 @@
-/* $Id: radio.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: radio.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: radio.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: radio.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: radio.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <string.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/scroll.c b/ui/scroll.c
index f4721c31..e70d5fae 100644
--- a/ui/scroll.c
+++ b/ui/scroll.c
@@ -1,4 +1,4 @@
-/* $Id: scroll.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: scroll.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: scroll.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: scroll.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -23,7 +23,7 @@ static char rcsid[] = "$Id: scroll.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <stdlib.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/ui.c b/ui/ui.c
index de77b51b..d69a1414 100644
--- a/ui/ui.c
+++ b/ui/ui.c
@@ -1,4 +1,4 @@
- /* $Id: ui.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+ /* $Id: ui.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: ui.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: ui.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +27,7 @@ static char rcsid[] = "$Id: ui.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <dos.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "key.h"
 #include "ui.h"
diff --git a/ui/uidraw.c b/ui/uidraw.c
index 69c3bf8a..4ca4bbca 100644
--- a/ui/uidraw.c
+++ b/ui/uidraw.c
@@ -1,4 +1,4 @@
-/* $Id: uidraw.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: uidraw.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: uidraw.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: uidraw.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -21,7 +21,7 @@ static char rcsid[] = "$Id: uidraw.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #endif
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 
diff --git a/ui/userbox.c b/ui/userbox.c
index 0bf0ce90..9e6a3587 100644
--- a/ui/userbox.c
+++ b/ui/userbox.c
@@ -1,4 +1,4 @@
-/* $Id: userbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $ */
+/* $Id: userbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: userbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
+static char rcsid[] = "$Id: userbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -24,7 +24,7 @@ static char rcsid[] = "$Id: userbox.c,v 1.3 2004-12-19 15:21:11 btb Exp $";
 #include <string.h>
 
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
diff --git a/ui/window.c b/ui/window.c
index 31083843..1b6966eb 100644
--- a/ui/window.c
+++ b/ui/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.4 2004-12-21 11:24:23 btb Exp $ */
+/* $Id: window.c,v 1.5 2005-01-24 22:19:10 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
 #ifdef RCS
-static char rcsid[] = "$Id: window.c,v 1.4 2004-12-21 11:24:23 btb Exp $";
+static char rcsid[] = "$Id: window.c,v 1.5 2005-01-24 22:19:10 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -25,9 +25,9 @@ static char rcsid[] = "$Id: window.c,v 1.4 2004-12-21 11:24:23 btb Exp $";
 #include <stdarg.h>
 #include <dos.h>
 
-#include "mem.h"
+#include "u_mem.h"
 #include "fix.h"
-#include "types.h"
+#include "pstypes.h"
 #include "gr.h"
 #include "ui.h"
 #include "key.h"
-- 
2.39.2