nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

remove STATIC_DCL, STATIC_OVL, STATIC_VAR, STATIC_PTR

Browse Source
This commit is contained in:
nhmall
2019-07-14 18:15:49 -04:00
parent 6a75dc5dcf 865b301f0d
commit bd9709ad77
107 changed files with 2476 additions and 2505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sys/msdos/msdos.c
View File

@@ -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;

4
sys/msdos/pctiles.c
View File

@@ -33,8 +33,8 @@
#include "tile.h"
#include "pctiles.h"
STATIC_VAR FILE *tilefile;
STATIC_VAR FILE *tilefile_O;
static FILE *tilefile;
static FILE *tilefile_O;
extern short glyph2tile[]; /* in tile.c (made from tilemap.c) */
#ifdef TILES_IN_RAM

4
sys/msdos/video.c
View File

@@ -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

44
sys/msdos/vidvga.c
View File

@@ -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;

10
sys/share/pcmain.c
View File

@@ -41,8 +41,8 @@ extern int bigscreen;
void NDECL(preserve_icon);
#endif
STATIC_DCL void FDECL(process_options, (int argc, char **argv));
STATIC_DCL void NDECL(nhusage);
static void FDECL(process_options, (int argc, char **argv));
static void NDECL(nhusage);
#if defined(MICRO) || defined(OS2)
extern void FDECL(nethack_exit, (int));
@@ -51,7 +51,7 @@ extern void FDECL(nethack_exit, (int));
#endif
#ifdef EXEPATH
STATIC_DCL char *FDECL(exepath, (char *));
static char *FDECL(exepath, (char *));
#endif
int FDECL(main, (int, char **));
@@ -531,7 +531,7 @@ attempt_restore:
return resuming;
}
STATIC_OVL void
static void
process_options(argc, argv)
int argc;
char *argv[];
@@ -662,7 +662,7 @@ char *argv[];
}
}
STATIC_OVL void
static void
nhusage()
{
char buf1[BUFSZ], buf2[BUFSZ], *bufptr;

12
sys/share/pcsys.c
View File

@@ -33,7 +33,7 @@ void FDECL(nethack_exit, (int));
#else
#define nethack_exit exit
#endif
STATIC_DCL void NDECL(msexit);
static void NDECL(msexit);
#ifdef MOVERLAY
extern void __far __cdecl _movepause(void);
@@ -45,9 +45,9 @@ extern unsigned short __far __cdecl _movefpaused;
#endif /* MOVERLAY */
#ifdef MFLOPPY
STATIC_DCL boolean NDECL(record_exists);
static boolean NDECL(record_exists);
#ifndef TOS
STATIC_DCL boolean NDECL(comspec_exists);
static boolean NDECL(comspec_exists);
#endif
#endif
@@ -305,7 +305,7 @@ int start;
}
/* Return 1 if the record file was found */
STATIC_OVL boolean
static boolean
record_exists()
{
FILE *fp;
@@ -324,7 +324,7 @@ record_exists()
#else
#ifdef MFLOPPY
/* Return 1 if the comspec was found */
STATIC_OVL boolean
static boolean
comspec_exists()
{
int fd;
@@ -492,7 +492,7 @@ int code;
extern boolean run_from_desktop; /* set in pcmain.c */
#endif
STATIC_OVL void
static void
msexit()
{
#ifdef CHDIR

4
sys/winnt/windmain.c
View File

@@ -374,7 +374,7 @@ attempt_restore:
return 0;
}
STATIC_OVL void
static void
process_options(argc, argv)
int argc;
char *argv[];
@@ -555,7 +555,7 @@ char *argv[];
}
}
STATIC_OVL void
static void
nhusage()
{
char buf1[BUFSZ], buf2[BUFSZ], *bufptr;