From 4fa4c265af0873f0ad23a411ff48ccd4a645304f Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Thu, 10 Aug 2006 08:30:01 +0000
Subject: [PATCH] No more INCLUDE_WINDOWS_H.

---
 curses.h         | 11 ++---------
 win32/pdcclip.c  |  5 +++--
 win32/pdcdisp.c  |  5 +++--
 win32/pdcgetsc.c |  5 +++--
 win32/pdckbd.c   |  5 +++--
 win32/pdcscrn.c  |  5 +++--
 win32/pdcsetsc.c |  7 ++++---
 win32/pdcutil.c  |  5 +++--
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/curses.h b/curses.h
index 896bc35f..8688efd8 100644
--- a/curses.h
+++ b/curses.h
@@ -15,7 +15,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: curses.h,v 1.206 2006/08/10 07:17:14 wmcbrine Exp $ */
+/* $Id: curses.h,v 1.207 2006/08/10 08:30:01 wmcbrine Exp $ */
 
 /*----------------------------------------------------------------------*
  *				PDCurses				*
@@ -281,7 +281,7 @@ PDCurses portable platform definitions list:
 #    define OS2 3		/* Major release of OS/2 supported	*/
 #    define CURSES__32BIT__
 #  endif
-#  if defined(__NT__) || defined(WIN32)
+#  if defined(__NT__)
 #    ifndef WIN32
 #      define WIN32
 #    endif
@@ -348,13 +348,6 @@ typedef int  _int;
 # define UNICODE
 #endif
 
-#if defined(WIN32) && defined(INCLUDE_WINDOWS_H)
-# include <windows.h>
-# ifdef MOUSE_MOVED
-#  undef MOUSE_MOVED
-# endif
-#endif
-
 #if defined(OS2) && !defined(EMXVIDEO)
 # define INCL_VIO
 # define INCL_KBD
diff --git a/win32/pdcclip.c b/win32/pdcclip.c
index 1fc39951..b1d6cf72 100644
--- a/win32/pdcclip.c
+++ b/win32/pdcclip.c
@@ -15,11 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	INCLUDE_WINDOWS_H
+#include <windows.h>
+#undef MOUSE_MOVED
 #define	CURSES_LIBRARY 1
 #include <curses.h>
 
-RCSID("$Id: pdcclip.c,v 1.15 2006/03/29 20:06:41 wmcbrine Exp $");
+RCSID("$Id: pdcclip.c,v 1.16 2006/08/10 08:30:01 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/win32/pdcdisp.c b/win32/pdcdisp.c
index 6b7df1b8..c947bede 100644
--- a/win32/pdcdisp.c
+++ b/win32/pdcdisp.c
@@ -15,8 +15,9 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
+#include <windows.h>
+#undef MOUSE_MOVED
 #define CURSES_LIBRARY 1
-#define INCLUDE_WINDOWS_H
 #include <curses.h>
 #include <stdlib.h>
 #include <string.h>
@@ -24,7 +25,7 @@
 extern HANDLE hConOut;
 extern unsigned char atrtab[MAX_ATRTAB];
 
-RCSID("$Id: pdcdisp.c,v 1.32 2006/07/30 03:55:46 wmcbrine Exp $");
+RCSID("$Id: pdcdisp.c,v 1.33 2006/08/10 08:30:01 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
diff --git a/win32/pdcgetsc.c b/win32/pdcgetsc.c
index ca600ff1..2c4ea78a 100644
--- a/win32/pdcgetsc.c
+++ b/win32/pdcgetsc.c
@@ -15,11 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
+#include <windows.h>
+#undef MOUSE_MOVED
 #define	CURSES_LIBRARY 1
-#define	INCLUDE_WINDOWS_H
 #include <curses.h>
 
-RCSID("$Id: pdcgetsc.c,v 1.22 2006/07/30 22:36:18 wmcbrine Exp $");
+RCSID("$Id: pdcgetsc.c,v 1.23 2006/08/10 08:30:01 wmcbrine Exp $");
 
 extern HANDLE hConOut, hConIn;
 
diff --git a/win32/pdckbd.c b/win32/pdckbd.c
index 16cd8436..903e2d2b 100644
--- a/win32/pdckbd.c
+++ b/win32/pdckbd.c
@@ -15,11 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
+#include <windows.h>
+#undef MOUSE_MOVED
 #define CURSES_LIBRARY 1
-#define INCLUDE_WINDOWS_H
 #include <curses.h>
 
-RCSID("$Id: pdckbd.c,v 1.54 2006/08/10 02:34:18 wmcbrine Exp $");
+RCSID("$Id: pdckbd.c,v 1.55 2006/08/10 08:30:01 wmcbrine Exp $");
 
 #define ACTUAL_MOUSE_MOVED	  (Actual_Mouse_status.changes & 8)
 #define ACTUAL_BUTTON_STATUS(x)   (Actual_Mouse_status.button[(x) - 1])
diff --git a/win32/pdcscrn.c b/win32/pdcscrn.c
index 011a7720..85317e4d 100644
--- a/win32/pdcscrn.c
+++ b/win32/pdcscrn.c
@@ -15,11 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
+#include <windows.h>
+#undef MOUSE_MOVED
 #define CURSES_LIBRARY 1
-#define INCLUDE_WINDOWS_H
 #include <curses.h>
 
-RCSID("$Id: pdcscrn.c,v 1.45 2006/08/10 02:34:18 wmcbrine Exp $");
+RCSID("$Id: pdcscrn.c,v 1.46 2006/08/10 08:30:01 wmcbrine Exp $");
 
 #define PDC_RESTORE_NONE     0
 #define PDC_RESTORE_BUFFER   1
diff --git a/win32/pdcsetsc.c b/win32/pdcsetsc.c
index b2cd7dd4..558eee32 100644
--- a/win32/pdcsetsc.c
+++ b/win32/pdcsetsc.c
@@ -15,11 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-#define	CURSES_LIBRARY 1
-#define	INCLUDE_WINDOWS_H
+#include <windows.h>
+#undef MOUSE_MOVED
+#define CURSES_LIBRARY 1
 #include <curses.h>
 
-RCSID("$Id: pdcsetsc.c,v 1.23 2006/07/23 23:42:23 wmcbrine Exp $");
+RCSID("$Id: pdcsetsc.c,v 1.24 2006/08/10 08:30:01 wmcbrine Exp $");
 
 extern HANDLE hConOut;
 
diff --git a/win32/pdcutil.c b/win32/pdcutil.c
index 2241a7f2..b7a72a3d 100644
--- a/win32/pdcutil.c
+++ b/win32/pdcutil.c
@@ -15,11 +15,12 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
+#include <windows.h>
+#undef MOUSE_MOVED
 #define CURSES_LIBRARY 1
-#define INCLUDE_WINDOWS_H
 #include <curses.h>
 
-RCSID("$Id: pdcutil.c,v 1.4 2006/07/15 15:13:40 wmcbrine Exp $");
+RCSID("$Id: pdcutil.c,v 1.5 2006/08/10 08:30:01 wmcbrine Exp $");
 
 void PDC_beep(void)
 {