fmt_ptr (trunk only)

fmt_ptr() is no longer dependant on WIZARD or MONITOR_HEAP,
so that it can be used in panic messages.
This commit is contained in:
nethack.allison
2006-07-02 18:43:35 +00:00
parent 13eeae9523
commit 3d164b6d02
6 changed files with 23 additions and 28 deletions

View File

@@ -53,21 +53,7 @@ register unsigned int lth;
#endif
}
#if defined(MONITOR_HEAP) || defined(WIZARD)
# if defined(MICRO) || defined(WIN32)
/* we actually want to know which systems have an ANSI run-time library
* to know which support the new %p format for printing pointers.
* due to the presence of things like gcc, NHSTDC is not a good test.
* so we assume microcomputers have all converted to ANSI and bigger
* computers which may have older libraries give reasonable results with
* the cast.
*/
# define MONITOR_PTR_FMT
# endif
# ifdef MONITOR_PTR_FMT
# ifdef HAS_PTR_FMT
# define PTR_FMT "%p"
# define PTR_TYP genericptr_t
# else
@@ -85,8 +71,6 @@ char *buf;
return buf;
}
#endif
#ifdef MONITOR_HEAP
/* If ${NH_HEAPLOG} is defined and we can create a file by that name,
@@ -108,7 +92,7 @@ const char *file;
int line;
{
long *ptr = alloc(lth);
char ptr_address[20];
char ptr_address[FMT_PTR_BUFSIZ];
if (!tried_heaplog) heapmon_init();
if (heaplog)
@@ -128,7 +112,7 @@ genericptr_t ptr;
const char *file;
int line;
{
char ptr_address[20];
char ptr_address[FMT_PTR_BUFSIZ];
if (!tried_heaplog) heapmon_init();
if (heaplog)