ncurses 6.1 - patch 20190713

[ncurses.git] / test / picsmap.c

diff --git a/test/picsmap.c b/test/picsmap.c
index c9c5770145c202bef5b540e945a7b81bf0ca310c..dd33d78c0ceac67d2377f91ea1cc3aa3c322c75f 100644 (file)
--- a/test/picsmap.c
+++ b/test/picsmap.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: picsmap.c,v 1.127 2019/01/21 19:45:57 tom Exp $
+ * $Id: picsmap.c,v 1.129 2019/04/20 20:33:51 tom Exp $
  *
  * Author: Thomas E. Dickey
  *
@@ -61,10 +61,6 @@
 
 #if HAVE_TSEARCH
 #include <search.h>
-#if HAVE_TDESTROY && !defined(_GNU_SOURCE)
-#undef HAVE_TDESTROY
-#define HAVE_TDESTROY 0
-#endif
 #endif
 
 #undef CUR                     /* use only the curses interface */
@@ -383,26 +379,15 @@ finish_c_values(PICS_HEAD * head)
     reading_ncols = 0;
 }
 
-#if HAVE_TSEARCH && HAVE_TDESTROY
-static void
-never_free(void *node GCC_UNUSED)
-{
-}
-#endif
-
 static void
 dispose_c_values(void)
 {
 #if HAVE_TSEARCH
     if (reading_ntree != 0) {
-#if HAVE_TDESTROY
-       tdestroy(reading_ntree, never_free);
-#else
        int n;
        for (n = 0; n < reading_last; ++n) {
            tdelete(I2P(n), &reading_ntree, compare_c_values);
        }
-#endif
        reading_ntree = 0;
     }
 #endif
@@ -1464,6 +1449,7 @@ dump_picture(PICS_HEAD * pics)
 static void
 init_display(const char *palette_path, int opt_d)
 {
+    (void) opt_d;
     if (isatty(fileno(stdout))) {
        in_curses = TRUE;
        initscr();