From 2ae6d72765d519a6e9e83f30273f54b1851a2c98 Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sun, 14 Jul 2019 17:26:52 -0400
Subject: [PATCH] remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR from
 sys/msdos

---
 sys/msdos/msdos.c  | 16 ++++++++--------
 sys/msdos/video.c  |  4 ++--
 sys/msdos/vidvga.c | 44 ++++++++++++++++++++++----------------------
 3 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/sys/msdos/msdos.c b/sys/msdos/msdos.c
index 69f994be6..b68041943 100644
--- a/sys/msdos/msdos.c
+++ b/sys/msdos/msdos.c
@@ -49,12 +49,12 @@ void FDECL(get_cursor, (int *, int *));
 
 /* direct bios calls are used only when iflags.BIOS is set */
 
-STATIC_DCL char NDECL(DOSgetch);
-STATIC_DCL char NDECL(BIOSgetch);
+static char NDECL(DOSgetch);
+static char NDECL(BIOSgetch);
 #ifndef __GO32__
-STATIC_DCL char *NDECL(getdta);
+static char *NDECL(getdta);
 #endif
-STATIC_DCL unsigned int FDECL(dos_ioctl, (int, int, unsigned));
+static unsigned int FDECL(dos_ioctl, (int, int, unsigned));
 #ifdef USE_TILES
 extern boolean FDECL(pckeys, (unsigned char, unsigned char)); /* pckeys.c */
 #endif
@@ -243,7 +243,7 @@ static const char numeric_scanmap[] = { /* ... */
 #define ALT 0x8
 #endif /* PC9800 */
 
-STATIC_OVL char
+static char
 BIOSgetch()
 {
     unsigned char scan, shift, ch = 0;
@@ -303,7 +303,7 @@ BIOSgetch()
     return ch;
 }
 
-STATIC_OVL char
+static char
 DOSgetch()
 {
     union REGS regs;
@@ -406,7 +406,7 @@ foundfile_buffer()
 }
 
 /* Get disk transfer area */
-STATIC_OVL char *
+static char *
 getdta()
 {
     union REGS regs;
@@ -503,7 +503,7 @@ enable_ctrlP()
     return;
 }
 
-STATIC_OVL unsigned int
+static unsigned int
 dos_ioctl(handle, mode, setvalue)
 int handle, mode;
 unsigned setvalue;
diff --git a/sys/msdos/video.c b/sys/msdos/video.c
index 76002cdf6..e53cc9d5f 100644
--- a/sys/msdos/video.c
+++ b/sys/msdos/video.c
@@ -122,7 +122,7 @@ void FDECL(get_cursor, (int *, int *));
 void FDECL(adjust_cursor_flags, (struct WinDesc *));
 void FDECL(cmov, (int, int));
 void FDECL(nocmov, (int, int));
-STATIC_DCL void NDECL(init_ttycolor);
+static void NDECL(init_ttycolor);
 
 int savevmode;               /* store the original video mode in here */
 int curcol, currow;          /* graphics mode current cursor locations */
@@ -719,7 +719,7 @@ char *schoice[3] = { "dark", "normal", "light" };
 char *shade[3];
 #endif /* VIDEOSHADES */
 
-STATIC_OVL void
+static void
 init_ttycolor()
 {
 #ifdef VIDEOSHADES
diff --git a/sys/msdos/vidvga.c b/sys/msdos/vidvga.c
index 13c873737..8f4240176 100644
--- a/sys/msdos/vidvga.c
+++ b/sys/msdos/vidvga.c
@@ -104,18 +104,18 @@
 
 extern short glyph2tile[];
 
-/* STATIC_DCL void FDECL(vga_NoBorder, (int));  */
+/* static void FDECL(vga_NoBorder, (int));  */
 void FDECL(vga_gotoloc, (int, int)); /* This should be made a macro */
 void NDECL(vga_backsp);
 #ifdef SCROLLMAP
-STATIC_DCL void FDECL(vga_scrollmap, (BOOLEAN_P));
+static void FDECL(vga_scrollmap, (BOOLEAN_P));
 #endif
-STATIC_DCL void FDECL(vga_redrawmap, (BOOLEAN_P));
+static void FDECL(vga_redrawmap, (BOOLEAN_P));
 static void FDECL(vga_cliparound, (int, int));
-STATIC_OVL void FDECL(decal_planar, (struct planar_cell_struct *, unsigned));
+static void FDECL(decal_planar, (struct planar_cell_struct *, unsigned));
 
 #ifdef POSITIONBAR
-STATIC_DCL void NDECL(positionbar);
+static void NDECL(positionbar);
 static void FDECL(vga_special, (int, int, int));
 #endif
 
@@ -147,11 +147,11 @@ extern boolean inmap;           /* in the map window */
  * Global Variables
  */
 
-STATIC_VAR unsigned char __far *font;
-STATIC_VAR char *screentable[SCREENHEIGHT];
+static unsigned char __far *font;
+static char *screentable[SCREENHEIGHT];
 
-STATIC_VAR const struct Pixel *paletteptr;
-STATIC_VAR struct map_struct {
+static const struct Pixel *paletteptr;
+static struct map_struct {
     int glyph;
     int ch;
     int attr;
@@ -171,13 +171,13 @@ STATIC_VAR struct map_struct {
     }
 #define TOP_MAP_ROW 1
 
-STATIC_VAR int vgacmap[CLR_MAX] = {  1, 4, 6, 10, 5, 9, 0, 15,
+static int vgacmap[CLR_MAX] = {  1, 4, 6, 10, 5, 9, 0, 15,
                                     12, 3, 7,  8, 2, 9, 0, 14 };
-STATIC_VAR int viewport_size = 40;
-/* STATIC_VAR char masktable[8]={0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01}; */
-/* STATIC_VAR char bittable[8]= {0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80}; */
+static int viewport_size = 40;
+/* static char masktable[8]={0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01}; */
+/* static char bittable[8]= {0x01,0x02,0x04,0x08,0x10,0x20,0x40,0x80}; */
 #if 0
-STATIC_VAR char defpalette[] = {	/* Default VGA palette         */
+static char defpalette[] = {	/* Default VGA palette         */
 	0x00, 0x00, 0x00,
 	0x00, 0x00, 0xaa,
 	0x00, 0xaa, 0x00,
@@ -202,10 +202,10 @@ int vp[SCREENPLANES] = { 8, 4, 2, 1 };
 #endif
 int vp2[SCREENPLANES] = { 1, 2, 4, 8 };
 
-STATIC_VAR struct planar_cell_struct planecell;
-STATIC_VAR struct overview_planar_cell_struct planecell_O;
+static struct planar_cell_struct planecell;
+static struct overview_planar_cell_struct planecell_O;
 
-/* STATIC_VAR int  g_attribute;	*/ /* Current attribute to use */
+/* static int  g_attribute;	*/ /* Current attribute to use */
 
 void
 vga_get_scr_size()
@@ -455,7 +455,7 @@ int x, y;
     }
 }
 
-STATIC_OVL void
+static void
 vga_redrawmap(clearfirst)
 boolean clearfirst;
 {
@@ -578,7 +578,7 @@ vga_refresh()
 }
 
 #ifdef SCROLLMAP
-STATIC_OVL void
+static void
 vga_scrollmap(left)
 boolean left;
 {
@@ -724,7 +724,7 @@ unsigned char (*indexes)[TILE_X];
     }
 }
 
-STATIC_OVL void
+static void
 decal_planar(gp, special)
 struct planar_cell_struct *gp;
 unsigned special;
@@ -858,7 +858,7 @@ vga_Finish(void)
  * to a more standard values - MJA 94/04/23.
  *
  */
-STATIC_OVL void 
+static void 
 vga_NoBorder(int bc)
 {
 	union REGS regs;
@@ -1121,7 +1121,7 @@ char *posbar;
     *p = 0;
 }
 
-STATIC_OVL void
+static void
 positionbar()
 {
     char *posbar = pbar;