ncurses 6.2 - patch 20200906

[ncurses.git] / ncurses / trace / lib_trace.c

diff --git a/ncurses/trace/lib_trace.c b/ncurses/trace/lib_trace.c
index 2c10b51d0170ab142e99807ea64c19638c8eb904..5eb87fe0c1760bb5c71595d767c99f2e8133e8a0 100644 (file)
--- a/ncurses/trace/lib_trace.c
+++ b/ncurses/trace/lib_trace.c
@@ -48,7 +48,7 @@
 
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_trace.c,v 1.95 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_trace.c,v 1.97 2020/08/29 16:22:03 juergen Exp $")
 
 NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
 
@@ -213,7 +213,7 @@ _nc_va_tracef(const char *fmt, va_list ap)
 # if USE_WEAK_SYMBOLS
        if ((pthread_self))
 # endif
-#ifdef _WIN32
+#ifdef _NC_WINDOWS
            fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self().p);
 #else
            fprintf(fp, "%#lx:", (long) (intptr_t) pthread_self());
@@ -349,7 +349,7 @@ _nc_fmt_funcptr(char *target, const char *source, size_t size)
        if (ch != 0 || (n + 1) >= size)
            leading = FALSE;
        if (!leading) {
-           _nc_SPRINTF(dst, _nc_SLIMIT(TR_FUNC_LEN - (dst - target))
+           _nc_SPRINTF(dst, _nc_SLIMIT(TR_FUNC_LEN - (size_t) (dst - target))
                        "%02x", ch & 0xff);
            dst += 2;
        }