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

change references from winnt to windows

Browse Source 
rename sys/winnt to sys/windows
move vs (visual studio) folder out of win/win32 and into sys/windows
rename include/ntconf.h to include/windconf.h
rename winnt.c to windsys.c
place visual studio projects into individual subfolders.

This will hopefully resolve GitHub issue #484 as well.
This commit is contained in:
nhmall
2021-06-03 12:14:27 -04:00
parent acfbf20958
commit 0a10bd632d
140 changed files with 1013 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/extern.h
View File

@@ -1539,7 +1539,7 @@ extern void mplayer_talk(struct monst *);
#if defined(MICRO) || defined(WIN32)
/* ### msdos.c,os2.c,tos.c,winnt.c ### */
/* ### msdos.c,os2.c,tos.c,windows.c ### */
#ifndef WIN32
extern int tgetch(void);
@@ -1565,7 +1565,7 @@ extern void chdrive(char *);
extern void disable_ctrlP(void);
extern void enable_ctrlP(void);
#endif
#if defined(MICRO) && !defined(WINNT)
#if defined(MICRO) && !defined(WIN32)
extern void get_scr_size(void);
#ifndef TOS
extern void gotoxy(int, int);
@@ -1699,19 +1699,19 @@ extern const char *regex_error_desc(struct nhregex *);
extern boolean regex_match(const char *, struct nhregex *);
extern void regex_free(struct nhregex *);
/* ### nttty.c ### */
/* ### consoletty.c ### */
#ifdef WIN32
extern void get_scr_size(void);
extern int nttty_kbhit(void);
extern void nttty_open(int);
extern void nttty_rubout(void);
extern int consoletty_kbhit(void);
extern void consoletty_open(int);
extern void consoletty_rubout(void);
extern int tgetch(void);
extern int ntposkey(int *, int *, int *);
extern int console_poskey(int *, int *, int *);
extern void set_output_mode(int);
extern void synch_cursor(void);
extern void nethack_enter_nttty(void);
extern void nttty_exit(void);
extern void nethack_enter_consoletty(void);
extern void consoletty_exit(void);
#endif /* WIN32 */
/* ### o_init.c ### */
@@ -3061,10 +3061,10 @@ extern char *decode_mixed(char *, const char *);
extern void genl_putmixed(winid, int, const char *);
extern boolean menuitem_invert_test(int, unsigned, boolean);
/* ### winnt.c ### */
/* ### windows.c ### */
#ifdef WIN32
extern void nethack_enter_winnt(void);
extern void nethack_enter_windows(void);
#endif
/* ### wizard.c ### */

2
include/global.h
View File

@@ -162,7 +162,7 @@ extern struct cross_target_s cross_target;
#endif
#ifdef WIN32
#include "ntconf.h"
#include "windconf.h"
#endif
#include "warnings.h"

12
include/ntconf.h → include/windconf.h
View File

@@ -1,9 +1,9 @@
/* NetHack 3.7 ntconf.h $NHDT-Date: 1596498552 2020/08/03 23:49:12 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.89 $ */
/* NetHack 3.7 windconf.h $NHDT-Date: 1596498552 2020/08/03 23:49:12 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.89 $ */
/* Copyright (c) NetHack PC Development Team 1993, 1994. */
/* NetHack may be freely redistributed. See license for details. */
#ifndef NTCONF_H
#define NTCONF_H
#ifndef WINDCONF_H
#define WINDCONF_H
/* #define SHELL */ /* nt use of pcsys routines caused a hang */
@@ -223,7 +223,7 @@ extern const char *alllevels, *allbones;
#define getuid() 1
#define getlogin() ((char *) 0)
extern void win32_abort(void);
extern void nttty_preference_update(const char *);
extern void consoletty_preference_update(const char *);
extern void toggle_mouse_support(void);
extern void map_subkeyvalue(char *);
#if defined(WIN32CON)
@@ -273,7 +273,7 @@ extern int set_win32_option(const char *, const char *);
extern int alternative_palette(char *);
#endif
#define nethack_enter(argc, argv) nethack_enter_winnt()
#define nethack_enter(argc, argv) nethack_enter_windows()
extern void nethack_exit(int) NORETURN;
extern boolean file_exists(const char *);
extern boolean file_newer(const char *, const char *);
@@ -290,4 +290,4 @@ extern void nt_assert_failed(const char *, const char *, int);
#define nhassert(expression) (void)((!!(expression)) || \
(nt_assert_failed(#expression, __FILE__, __LINE__), 0))
#endif /* NTCONF_H */
#endif /* WINDCONF_H */