Merge branch 1.0-bugfix into master

[vlc] / src / test / dictionary.c

diff --git a/src/test/dictionary.c b/src/test/dictionary.c
index 62feb36bd15a8c1ef455bff0ff56b7e16c7670d9..7c823749b1add2c414614d1cbba2b216d15b3653 100644 (file)
--- a/src/test/dictionary.c
+++ b/src/test/dictionary.c
@@ -23,7 +23,10 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#undef NDEBUG
+#include <assert.h>
+
+#include <vlc_common.h>
 #include "vlc_arrays.h"
 
 #include <stdio.h>
@@ -39,12 +42,12 @@ static void test_dictionary_validity (vlc_dictionary_t * p_dict, const char ** o
 
     for( j = 0; keys[j]; j++ )
     {
-        vlc_bool_t found = VLC_FALSE;
+        bool found = false;
         for( i = 0; i < size; i++ )
         {
             if(!strcmp( keys[j], our_keys[i] ))
             {
-                found = VLC_TRUE;
+                found = true;
                 break;
             }
         }
@@ -82,11 +85,11 @@ int main (void)
 
     test_dictionary_validity( &dict, our_keys, size );
 
-    vlc_dictionary_remove_value_for_key( &dict, our_keys[size-1] );
+    vlc_dictionary_remove_value_for_key( &dict, our_keys[size-1], NULL, NULL );
 
     test_dictionary_validity( &dict, our_keys, size-1 );
-    
-    vlc_dictionary_clear( &dict );
+
+    vlc_dictionary_clear( &dict, NULL, NULL );
 
     assert( vlc_dictionary_keys_count( &dict ) == 0 );
     return 0;