Second tranche of updates for pipework branch.

	modified:   bgpd/bgp_connection.c
	modified:   bgpd/bgp_debug.c
	modified:   bgpd/bgp_engine.h
	modified:   bgpd/bgp_main.c
	modified:   bgpd/bgp_packet.c
	modified:   bgpd/bgp_peer.c
	modified:   bgpd/bgp_route.c
	modified:   bgpd/bgp_routemap.c
	modified:   bgpd/bgp_session.c
	modified:   bgpd/bgp_vty.c
	modified:   bgpd/bgpd.c
	modified:   bgpd/bgpd.h
	modified:   configure.ac
	modified:   isisd/dict.h
	modified:   isisd/isis_misc.c
	modified:   isisd/isis_routemap.c
	modified:   isisd/isis_spf.c
	modified:   lib/Makefile.am
	modified:   lib/command.c
	modified:   lib/command.h
	modified:   lib/command_execute.h
	modified:   lib/command_parse.c
	modified:   lib/command_parse.h
	modified:   lib/command_queue.c
	modified:   lib/command_queue.h
	modified:   lib/elstring.h
	modified:   lib/heap.c
	modified:   lib/if.c
	modified:   lib/if.h
	modified:   lib/keychain.c
	modified:   lib/keystroke.c
	modified:   lib/keystroke.h
	modified:   lib/list_util.c
	modified:   lib/list_util.h
	modified:   lib/log.c
	modified:   lib/log.h
	modified:   lib/memory.c
	modified:   lib/memory.h
	modified:   lib/memtypes.c
	modified:   lib/misc.h
	modified:   lib/mqueue.c
	modified:   lib/mqueue.h
	deleted:    lib/node_type.h
	modified:   lib/pthread_safe.c
	modified:   lib/qfstring.c
	modified:   lib/qiovec.c
	modified:   lib/qiovec.h
	modified:   lib/qpath.c
	modified:   lib/qpnexus.c
	modified:   lib/qpnexus.h
	modified:   lib/qpselect.c
	modified:   lib/qpthreads.h
	modified:   lib/qstring.c
	modified:   lib/qstring.h
	modified:   lib/qtime.c
	modified:   lib/qtime.h
	modified:   lib/qtimers.c
	modified:   lib/qtimers.h
	modified:   lib/routemap.c
	modified:   lib/symtab.h
	modified:   lib/thread.h
	deleted:    lib/uty.h
	modified:   lib/vector.c
	modified:   lib/vector.h
	modified:   lib/version.h.in
	modified:   lib/vio_fifo.c
	modified:   lib/vio_fifo.h
	modified:   lib/vio_lines.c
	modified:   lib/vio_lines.h
	modified:   lib/vty.c
	modified:   lib/vty.h
	modified:   lib/vty_cli.c
	modified:   lib/vty_cli.h
	modified:   lib/vty_io.c
	modified:   lib/vty_io.h
	modified:   lib/vty_io_basic.c
	modified:   lib/vty_io_basic.h
	modified:   lib/vty_io_file.c
	modified:   lib/vty_io_file.h
	modified:   lib/vty_io_shell.c
	modified:   lib/vty_io_term.c
	modified:   lib/vty_io_term.h
	modified:   lib/vty_local.h
	modified:   lib/vty_pipe.c
	modified:   lib/workqueue.h
	modified:   lib/zebra.h
	modified:   ospf6d/ospf6_lsa.c
	modified:   ripngd/ripngd.c
	modified:   tests/test-list_util.c
	modified:   tests/test-vector.c
	modified:   vtysh/vtysh.c
	modified:   vtysh/vtysh_config.c

1 files changed, 20 insertions, 4 deletions

diff --git a/lib/qpthreads.h b/lib/qpthreads.h
index 959194ad..da6b2319 100644
--- a/lib/qpthreads.h
+++ b/lib/qpthreads.h
@@ -52,6 +52,22 @@
 #error Require _POSIX_THREADS
 #endif
 
+#ifdef QPTHREADS_DEBUG          /* Can be forced from outside           */
+# if QPTHREADS_DEBUG
+#  define QPTHREADS_DEBUG 1     /* Force 1 or 0                         */
+#else
+#  define QPTHREADS_DEBUG 0
+# endif
+#else
+# ifdef  QDEBUG
+#  define QPTHREADS_DEBUG 1     /* Follow QDEBUG                        */
+#else
+#  define QPTHREADS_DEBUG 0
+# endif
+#endif
+
+enum { qpthreads_debug = QPTHREADS_DEBUG } ;
+
 /*==============================================================================
  * Global Switch -- this allows the library to be run WITHOUT pthreads !
  *
@@ -165,7 +181,7 @@ Inline bool qpt_thread_is_self(qpt_thread_t id)
  *
  * Quagga's default mutex type is:
  *
- *   * PTHREAD_MUTEX_ERRORCHECK unless NDEBUG && NDEBUG_QPTHREADS
+ *   * PTHREAD_MUTEX_ERRORCHECK if QPTHREADS_DEBUG
  *   * QPT_MUTEX_TYPE_DEFAULT
  *
  * QPT_MUTEX_TYPE_DEFAULT may be set elsewhere.  If it is not set then it is
@@ -200,10 +216,10 @@ enum qpt_mutex_options
 # define QPT_MUTEX_TYPE_DEFAULT  PTHREAD_MUTEX_NORMAL
 #endif
 
-#if defined(NDEBUG) && defined(NDEBUG_QPTHREADS)
-# define QPT_MUTEX_TYPE  QPT_MUTEX_TYPE_DEFAULT
-#else
+#if QPTHREADS_DEBUG
 # define QPT_MUTEX_TYPE  PTHREAD_MUTEX_ERRORCHECK
+#else
+# define QPT_MUTEX_TYPE  QPT_MUTEX_TYPE_DEFAULT
 #endif
 
 extern qpt_mutex                        /* freezes qpthreads_enabled    */