From 4884cff3f5f01ea168da3a26df23d0dbd544bda0 Mon Sep 17 00:00:00 2001
From: Hourier <hourier@users.sourceforge.jp>
Date: Sun, 22 Mar 2020 15:09:21 +0900
Subject: [PATCH] [Refactor] #40274 Removed unused preprocessors

---
 src/main-win.c | 56 +++++++++++---------------------------------------------
 1 file changed, 11 insertions(+), 45 deletions(-)

diff --git a/src/main-win.c b/src/main-win.c
index d81d3cde7..320b6b56f 100644
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -404,16 +404,9 @@ const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
 
 #define MoveTo(H,X,Y) MoveToEx(H, X, Y, NULL)
 
- /*
-  * Silliness for Windows 95
-  */
-#ifndef WS_EX_TOOLWINDOW
-# define WS_EX_TOOLWINDOW 0
-#endif
-
-  /*
-   * Foreground color bits (hard-coded by DOS)
-   */
+/*
+ * Foreground color bits
+ */
 #define VID_BLACK	0x00
 #define VID_BLUE	0x01
 #define VID_GREEN	0x02
@@ -423,36 +416,13 @@ const concptr angband_music_basic_name[MUSIC_BASIC_MAX] =
 #define VID_YELLOW	0x06
 #define VID_WHITE	0x07
 
-   /*
-	* Bright text (hard-coded by DOS)
-	*/
+/*
+ * Bright text
+ */
 #define VID_BRIGHT	0x08
 
-	/*
-	 * Background color bits (hard-coded by DOS)
-	 */
-#define VUD_BLACK	0x00
-#define VUD_BLUE	0x10
-#define VUD_GREEN	0x20
-#define VUD_CYAN	0x30
-#define VUD_RED		0x40
-#define VUD_MAGENTA	0x50
-#define VUD_YELLOW	0x60
-#define VUD_WHITE	0x70
-
-	 /*
-	  * Blinking text (hard-coded by DOS)
-	  */
-#define VUD_BRIGHT	0x80
-
-
-	  /*
-	   * Forward declare
-	   */
-typedef struct _term_data term_data;
-
 /*!
- * @struct _term_data
+ * @struct term_data
  * @brief ターム情報構造体 / Extra "term" data
  * @details
  * <p>
@@ -472,7 +442,7 @@ typedef struct _term_data term_data;
  * as attempting to represent the name of a font.
  * </p>
  */
-struct _term_data
+typedef struct
 {
 	term t;
 	concptr s;
@@ -512,8 +482,7 @@ struct _term_data
 	LOGFONT lf;
 
 	bool posfix;
-
-};
+} term_data;
 
 #define MAX_TERM_DATA 8	//!< Maximum number of windows 
 
@@ -659,7 +628,6 @@ static bool paint_rect = FALSE;
 static TERM_LEN mousex = 0, mousey = 0;
 static TERM_LEN oldx, oldy;
 
-
 /*!
  * @brief The "simple" color values
  * @details
@@ -687,7 +655,6 @@ static BYTE win_pal[256] =
 	VID_YELLOW					/* Light Umber XXX */
 };
 
-
 /*
  * Hack -- define which keys are "special"
  */
@@ -732,7 +699,6 @@ static byte ignore_key_list[] = {
 
 static bool is_already_running(void);
 
-
 /* bg */
 static void delete_bg(void)
 {
@@ -743,6 +709,7 @@ static void delete_bg(void)
 	}
 }
 
+
 static int init_bg(void)
 {
 	char * bmfile = bg_bitmap_file;
@@ -760,6 +727,7 @@ static int init_bg(void)
 	return 1;
 }
 
+
 static void DrawBG(HDC hdc, RECT *r)
 {
 	HDC hdcSrc;
@@ -2983,7 +2951,6 @@ static void init_windows(void)
 }
 
 
-
 /*
  * Prepare the menus
  */
@@ -4677,7 +4644,6 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, int nC
 		ANGBAND_KEYBOARD = "0";
 	else
 	{
-		/* todo PC-98のサポートは打ち切ったので削除したい */
 		switch (GetKeyboardType(1))
 		{
 		case 0x0D01: case 0x0D02:
-- 
2.11.0