Merge branch 'keni-wincw2' into NetHack-3.7
Lots of manually resolved conflicts.
This commit is contained in:
@@ -905,9 +905,11 @@ extern void dealloc_killer(struct kinfo *);
|
||||
extern void save_killers(NHFILE *) NONNULLARG1;
|
||||
extern void restore_killers(NHFILE *) NONNULLARG1;
|
||||
#ifdef CRASHREPORT
|
||||
extern boolean submit_web_report(const char *, char *);
|
||||
extern boolean submit_web_report(int, const char *, const char *);
|
||||
extern void crashreport_init(int, char *[]);
|
||||
extern void crashreport_bidshow(void);
|
||||
extern boolean swr_add_uricoded(const char *, char **, int *, char *);
|
||||
extern int dobugreport(void);
|
||||
#endif
|
||||
extern char *build_english_list(char *) NONNULLARG1;
|
||||
#if defined(PANICTRACE) && !defined(NO_SIGNAL)
|
||||
@@ -1924,6 +1926,13 @@ extern int dosuspend(void);
|
||||
extern void nt_regularize(char *);
|
||||
extern int(*nt_kbhit)(void);
|
||||
extern void Delay(int);
|
||||
# ifdef CRASHREPORT
|
||||
struct CRctxt;
|
||||
extern struct CRctxt *ctxp;
|
||||
extern int win32_cr_helper(char, struct CRctxt *, void *, int);
|
||||
extern int win32_cr_gettrace(int, char *, int);
|
||||
extern int *win32_cr_shellexecute(const char *);
|
||||
# endif
|
||||
#endif /* WIN32 */
|
||||
|
||||
#endif /* MICRO || WIN32 */
|
||||
|
||||
Reference in New Issue
Block a user