attempt to fix MS-DOS cross-compile

This commit is contained in:
nhmall
2024-03-07 15:50:05 -05:00
parent 23e39ee5f5
commit dbda2967cc
3 changed files with 9 additions and 2 deletions
+3
View File
@@ -259,6 +259,9 @@
# ifdef CRASHREPORT # ifdef CRASHREPORT
# undef CRASHREPORT # undef CRASHREPORT
# endif # endif
# ifdef MSDOS
# undef PANICTRACE
# endif
#endif #endif
#ifdef CRASHREPORT #ifdef CRASHREPORT
+2 -2
View File
@@ -460,11 +460,11 @@ extern struct nomakedefs_s nomakedefs;
#ifdef UNIX #ifdef UNIX
#if (NH_DEVEL_STATUS != NH_STATUS_RELEASED) #if (NH_DEVEL_STATUS != NH_STATUS_RELEASED)
/* see end.c */ /* see end.c */
#if !defined(CROSS_TO_WASM) #if !defined(CROSS_TO_WASM) && !defined(CROSS_TO_MSDOS)
#ifndef PANICTRACE #ifndef PANICTRACE
#define PANICTRACE #define PANICTRACE
#endif /* PANICTRACE */ #endif /* PANICTRACE */
#endif /* CROSS_TO_WASM */ #endif /* CROSS_TO_WASM | CROSS_TO_MSDOS */
#endif /* NH_DEVEL_STATUS != NH_STATUS_RELEASED */ #endif /* NH_DEVEL_STATUS != NH_STATUS_RELEASED */
#endif /* UNIX */ #endif /* UNIX */
+4
View File
@@ -1898,8 +1898,10 @@ build_english_list(char *in)
void void
NH_abort(char *why USED_FOR_CRASHREPORT) NH_abort(char *why USED_FOR_CRASHREPORT)
{ {
#ifdef PANICTRACE
int gdb_prio = SYSOPT_PANICTRACE_GDB; int gdb_prio = SYSOPT_PANICTRACE_GDB;
int libc_prio = SYSOPT_PANICTRACE_LIBC; int libc_prio = SYSOPT_PANICTRACE_LIBC;
#endif
static volatile boolean aborting = FALSE; static volatile boolean aborting = FALSE;
/* don't execute this code recursively if a second abort is requested /* don't execute this code recursively if a second abort is requested
@@ -1908,6 +1910,7 @@ NH_abort(char *why USED_FOR_CRASHREPORT)
return; return;
aborting = TRUE; aborting = TRUE;
#ifdef PANICTRACE
#ifdef CRASHREPORT #ifdef CRASHREPORT
if(!submit_web_report(1, "Panic", why)) if(!submit_web_report(1, "Panic", why))
#endif #endif
@@ -1935,6 +1938,7 @@ NH_abort(char *why USED_FOR_CRASHREPORT)
#ifndef NO_SIGNAL #ifndef NO_SIGNAL
panictrace_setsignals(FALSE); panictrace_setsignals(FALSE);
#endif #endif
#endif /* PANICTRACE */
NH_abort_; NH_abort_;
} }
#undef USED_FOR_CRASHREPORT #undef USED_FOR_CRASHREPORT