diff --git a/curspriv.h b/curspriv.h
index ce5cb341..14a3e6e6 100644
--- a/curspriv.h
+++ b/curspriv.h
@@ -15,7 +15,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: curspriv.h,v 1.67 2006/04/25 21:09:25 wmcbrine Exp $ */
+/* $Id: curspriv.h,v 1.68 2006/04/25 22:43:12 wmcbrine Exp $ */
 
 /*                         CURSPRIV.H
 
@@ -94,30 +94,24 @@ extern Regs regs;
 # define _FP_OFFSET(p)		((unsigned short)p & 0x000f)
 
 # ifdef __DJGPP__
-unsigned char getdosmembyte(int offs);	/* see: private\_dosmem.c */
+unsigned char getdosmembyte(int offs);
 unsigned short getdosmemword(int offs);
 void setdosmembyte(int offs, unsigned char b);
 void setdosmemword(int offs, unsigned short w);
 # else
 #  if SMALL || MEDIUM || MSC || defined(__PACIFIC__)
-#   define getdosmembyte(offs) \
-	(*((unsigned char far *) _FAR_POINTER(0,offs)))
-#   define getdosmemword(offs) \
-	(*((unsigned short far *) _FAR_POINTER(0,offs)))
-#   define setdosmembyte(offs,x) \
-	(*((unsigned char far *) _FAR_POINTER(0,offs)) = (x))
-#   define setdosmemword(offs,x) \
-	(*((unsigned short far *) _FAR_POINTER(0,offs)) = (x))
+#   define PDC_FAR far
 #  else
-#   define getdosmembyte(offs) \
-	(*((unsigned char *) _FAR_POINTER(0,offs)))
-#   define getdosmemword(offs) \
-	(*((unsigned short *) _FAR_POINTER(0,offs)))
-#   define setdosmembyte(offs,x) \
-	(*((unsigned char *) _FAR_POINTER(0,offs)) = (x))
-#   define setdosmemword(offs,x) \
-	(*((unsigned short *) _FAR_POINTER(0,offs)) = (x))
+#   define PDC_FAR
 #  endif
+#  define getdosmembyte(offs) \
+	(*((unsigned char PDC_FAR *) _FAR_POINTER(0,offs)))
+#  define getdosmemword(offs) \
+	(*((unsigned short PDC_FAR *) _FAR_POINTER(0,offs)))
+#  define setdosmembyte(offs,x) \
+	(*((unsigned char PDC_FAR *) _FAR_POINTER(0,offs)) = (x))
+#  define setdosmemword(offs,x) \
+	(*((unsigned short PDC_FAR *) _FAR_POINTER(0,offs)) = (x))
 # endif
 #endif
 
diff --git a/dos/pdcscrn.c b/dos/pdcscrn.c
index aab9db06..bad88f6e 100644
--- a/dos/pdcscrn.c
+++ b/dos/pdcscrn.c
@@ -24,7 +24,7 @@
 # include <sys/movedata.h>
 #endif
 
-RCSID("$Id: pdcscrn.c,v 1.27 2006/03/29 20:06:40 wmcbrine Exp $");
+RCSID("$Id: pdcscrn.c,v 1.28 2006/04/25 22:43:12 wmcbrine Exp $");
 
 static unsigned short *saved_screen = NULL;
 static int saved_lines = 0;
@@ -122,7 +122,7 @@ int PDC_scr_open(SCREEN *internal, bool echo)
 	PDC_LOG(("PDC_scr_open() - called\n"));
 
 	internal->orig_attr	 = FALSE;
-	internal->orig_emulation = getdosmembyte (0x487);
+	internal->orig_emulation = getdosmembyte(0x487);
 
 	PDC_get_cursor_pos(&internal->cursrow, &internal->curscol);