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

merging conflict fixup

Browse Source
This commit is contained in:
nhmall
2020-10-04 20:07:57 -04:00
parent 15c1cb648d
commit 11b5f29e07
2 changed files with 20 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/global.h
View File

@@ -331,15 +331,8 @@ struct version_info {
unsigned long incarnation; /* actual version number */
unsigned long feature_set; /* bitmask of config settings */
unsigned long entity_count; /* # of monsters and objects */
#ifndef __EMSCRIPTEN__
unsigned long struct_sizes1; /* size of key structs */
unsigned long struct_sizes2; /* size of more key structs */
#else /* __EMSCRIPTEN__ */
/* 'long' in WASM is 4 bytes, which is too small to hold version numbers
* such as: VERSION_SANITY2 */
unsigned long long struct_sizes1; /* size of key structs */
unsigned long long struct_sizes2; /* size of more key structs */
#endif /* !__EMSCRIPTEN__ */
};
struct savefile_info {
@@ -403,7 +396,7 @@ struct savefile_info {
/* PANICTRACE: Always defined for NH_DEVEL_STATUS != NH_STATUS_RELEASED
but only for supported platforms. */
#if defined(UNIX) && !defined(__EMSCRIPTEN__)
#ifdef UNIX
#if (NH_DEVEL_STATUS != NH_STATUS_RELEASED)
/* see end.c */
#if !defined(CROSS_TO_WASM)
@@ -421,7 +414,7 @@ struct savefile_info {
#if defined(MACOSX)
#define PANICTRACE_LIBC
#endif
#if defined(UNIX) && !defined(__EMSCRIPTEN__) /* no popen in WASM */
#ifdef UNIX
#if !defined(CROSS_TO_WASM) /* no popen in WASM */
#define PANICTRACE_GDB
#endif