Combined redundant include windows.h/undef MOUSE_MOVE sections.

This commit is contained in:
William McBrine
2006-01-15 22:50:46 +00:00
parent 540136eb22
commit bdb665c8a0

View File

@@ -18,7 +18,7 @@
***************************************************************************
*/
/*
$Id: curses.h,v 1.81 2006/01/15 21:38:03 wmcbrine Exp $
$Id: curses.h,v 1.82 2006/01/15 22:50:46 wmcbrine Exp $
*/
/*
*----------------------------------------------------------------------
@@ -198,12 +198,6 @@ PDCurses portable platform definitions list:
# include <os2.h>
# endif
# ifdef __WIN32__
# ifdef INCLUDE_WINDOWS_H /* only include for WIN32 files */
# include <windows.h>
# ifdef MOUSE_MOVED /* get rid of Windows #define */
# undef MOUSE_MOVED
# endif
# endif
# ifndef WIN32
# define WIN32 1
# endif
@@ -268,12 +262,6 @@ PDCurses portable platform definitions list:
# ifndef WIN32
# define WIN32
# endif
# ifdef INCLUDE_WINDOWS_H /* only include for WIN32 files */
# include <windows.h>
# ifdef MOUSE_MOVED /* get rid of Windows #define */
# undef MOUSE_MOVED
# endif
# endif
# ifndef HAVE_MEMORY_H
# define HAVE_MEMORY_H /* have <memory.h> */
# endif
@@ -440,12 +428,6 @@ PDCurses portable platform definitions list:
# ifndef HAVE_PROTO
# define HAVE_PROTO 1 /* Cygnuc GCC supports ANSI C prototypes */
# endif
# ifdef INCLUDE_WINDOWS_H
# include <windows.h>
# ifdef MOUSE_MOVED
# undef MOUSE_MOVED
# endif
# endif
# if !defined( WIN32 ) && !defined(XCURSES)
# define WIN32
# endif
@@ -473,12 +455,6 @@ PDCurses portable platform definitions list:
# ifndef HAVE_PROTO
# define HAVE_PROTO 1 /* Ming GCC supports ANSI C prototypes */
# endif
# ifdef INCLUDE_WINDOWS_H
# include <windows.h>
# ifdef MOUSE_MOVED
# undef MOUSE_MOVED
# endif
# endif
# ifndef WIN32
# define WIN32
# endif
@@ -501,12 +477,6 @@ PDCurses portable platform definitions list:
# ifndef HAVE_PROTO
# define HAVE_PROTO 1 /* LCC-Win32 supports ANSI C prototypes */
# endif
# ifdef INCLUDE_WINDOWS_H
# include <windows.h>
# ifdef MOUSE_MOVED
# undef MOUSE_MOVED
# endif
# endif
# ifndef WIN32
# define WIN32
# endif
@@ -570,12 +540,6 @@ PDCurses portable platform definitions list:
# endif
# endif
# if defined( __NT__ ) || defined ( WIN32 )
# ifdef INCLUDE_WINDOWS_H
# include <windows.h>
# ifdef MOUSE_MOVED
# undef MOUSE_MOVED
# endif
# endif
# ifndef WIN32
# define WIN32
# endif
@@ -649,6 +613,14 @@ PDCurses portable platform definitions list:
#endif
/*---------------------------------------------------------------------*/
#if defined(WIN32) && defined(INCLUDE_WINDOWS_H)
# include <windows.h>
# ifdef MOUSE_MOVED
# undef MOUSE_MOVED
# endif
#endif
#include <stdio.h> /* Required by X/Open usage below */
#if defined(__cplusplus) || defined(__cplusplus__) || defined(__CPLUSPLUS)