From 895c552ddea92352e1bd263698b15fcdff8d73a9 Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Sat, 6 Jan 2007 18:01:04 +0000
Subject: [PATCH] Moved PDCTHUNK definition to pdcos2.h. Preparatory to trying
 to make a proper PDC_set_title().

---
 os2/pdcos2.h  | 18 +++++++++++++++++-
 os2/pdcscrn.c | 19 +------------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/os2/pdcos2.h b/os2/pdcos2.h
index c8f7a372..8010d806 100644
--- a/os2/pdcos2.h
+++ b/os2/pdcos2.h
@@ -11,7 +11,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: pdcos2.h,v 1.4 2006/11/13 21:17:54 wmcbrine Exp $ */
+/* $Id: pdcos2.h,v 1.5 2007/01/06 18:01:04 wmcbrine Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
@@ -30,6 +30,22 @@
 
 #include <curspriv.h>
 
+#ifdef __WATCOMC__
+# define PDCTHUNK(x) ((ptr_16)(x))
+# ifdef __386__
+#  define SEG16 _Seg16
+# else
+#  define SEG16
+# endif
+
+typedef void * SEG16 ptr_16;
+
+#else
+# ifdef __EMX__
+#  define PDCTHUNK(x) ((PCH)_emx_32to16(x))
+# endif
+#endif
+
 extern int pdc_font;
 
 extern void PDC_get_keyboard_info(void);
diff --git a/os2/pdcscrn.c b/os2/pdcscrn.c
index 533b95d8..72c19c27 100644
--- a/os2/pdcscrn.c
+++ b/os2/pdcscrn.c
@@ -13,7 +13,7 @@
 
 #include "pdcos2.h"
 
-RCSID("$Id: pdcscrn.c,v 1.66 2007/01/03 14:10:46 wmcbrine Exp $");
+RCSID("$Id: pdcscrn.c,v 1.67 2007/01/06 18:01:04 wmcbrine Exp $");
 
 int pdc_font;			/* default font size	*/
 
@@ -22,28 +22,11 @@ static unsigned char *saved_screen = NULL;
 static int saved_lines = 0;
 static int saved_cols = 0;
 #else
-
-# ifdef __WATCOMC__
-#  define PDCTHUNK(x) ((ptr_16)(x))
-# else
-#  ifdef __EMX__
-#   define PDCTHUNK(x) ((PCH)_emx_32to16(x))
-#  endif
-# endif
-
-# if defined(__WATCOMC__) && defined(__386__)
-#  define SEG16 _Seg16
-# else
-#  define SEG16
-# endif
-
 # ifdef PDCTHUNK
-
 #  ifdef __EMX__
 #   define THUNKEDVIO VIOCOLORREG
 #  else
 
-typedef void * SEG16 ptr_16;
 typedef struct {
 	USHORT cb;
 	USHORT type;