Merge branch 'master' of /git/quagga.euro-ix into pipeworkex16p

This ensures that the two branches are consistent after the merging
of the old-Quagga 0.99.18 changes.

Release: 0.99.18ex16p.

Eliminated some whitespace differences !

Collected RESTRICTED_NODE show_bgp_ipv6_safi_route_cmd and
show_bgp_ipv6_safi_prefix_cmd, and one HAVE_IPV6 skip.  Also releasing
filename in closezlog().

Removed strlen() from lib/qfstring.c for async-signal-safe purposes.

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/test-vector.c b/tests/test-vector.c
index e95e3c58..7d2121cc 100644
--- a/tests/test-vector.c
+++ b/tests/test-vector.c
@@ -25,7 +25,7 @@ void test_vector_insert_item(void);
 void test_vector_insert_item_here(void);
 void test_vector_delete_item(void);
 void do_test_insert(const int rider);
-int sort_cmp(void const* const* a, void const* const* b);
+int sort_cmp(const void* const* a, const void* const* b);
 void test_vector_sort(void);
 void test_vector_bsearch(void);
 void test_vector_move_item_here(void);
@@ -550,7 +550,7 @@ test_vector_sort(void)
 }
 
 int
-sort_cmp(void const* const* a, void const* const* b)
+sort_cmp(const void* const* a, const void* const* b)
 {
   return strcmp(*a, *b);
 }