--- a/gst_plugins_base/tsrc/check/libs/tag/src/tag.c	Tue Aug 31 15:30:33 2010 +0300
+++ b/gst_plugins_base/tsrc/check/libs/tag/src/tag.c	Wed Sep 01 12:16:41 2010 +0100
@@ -33,20 +33,11 @@
 
 void create_xml(int result)
 {
-
     if(result)
-    {
         assert_failed = 1;
-    } 
-
+    
     testResultXml(xmlfile);
     close_log_file();
-
-    if(result)
-    {
-        exit (-1);
-    }    
-
 }
 
 #include "libgstreamer_wsd_solution.h" 
@@ -55,7 +46,7 @@
 GET_GLOBAL_VAR_FROM_TLS(buffers,gstcheck,GList*)
 #define buffers (*GET_GSTREAMER_WSD_VAR_NAME(buffers,gstcheck,g)())
 #else 
-IMPORT_C extern GList *buffers;
+extern GList *buffers;
 #endif
 
 
@@ -63,21 +54,21 @@
 static GET_GLOBAL_VAR_FROM_TLS(raised_critical,gstcheck,gboolean)
 #define _gst_check_raised_critical (*GET_GSTREAMER_WSD_VAR_NAME(raised_critical,gstcheck,g)())
 #else 
-IMPORT_C extern gboolean _gst_check_raised_critical;
+extern gboolean _gst_check_raised_critical;
 #endif
 //gboolean _gst_check_raised_warning = FALSE;
 #if EMULATOR
 static GET_GLOBAL_VAR_FROM_TLS(raised_warning,gstcheck,gboolean)
 #define _gst_check_raised_warning (*GET_GSTREAMER_WSD_VAR_NAME(raised_warning,gstcheck,g)())
 #else 
-IMPORT_C extern gboolean _gst_check_raised_warning;
+extern gboolean _gst_check_raised_warning;
 #endif
 //gboolean _gst_check_expecting_log = FALSE;
 #if EMULATOR
 static GET_GLOBAL_VAR_FROM_TLS(expecting_log,gstcheck,gboolean)
 #define _gst_check_expecting_log (*GET_GSTREAMER_WSD_VAR_NAME(expecting_log,gstcheck,g)())
 #else 
-IMPORT_C extern gboolean _gst_check_expecting_log;
+extern gboolean _gst_check_expecting_log;
 #endif
 
 //gboolean _gst_check_expecting_log = FALSE;
@@ -85,7 +76,7 @@
 static GET_GLOBAL_VAR_FROM_TLS(threads_running,gstcheck,gboolean)
 #define _gst_check_threads_running (*GET_GSTREAMER_WSD_VAR_NAME(threads_running,gstcheck,g)())
 #else 
-IMPORT_C extern gboolean _gst_check_threads_running;
+extern gboolean _gst_check_threads_running;
 #endif
 
 
@@ -94,7 +85,7 @@
 GET_GLOBAL_VAR_FROM_TLS(thread_list,gstcheck,GList*)
 #define thread_list (*GET_GSTREAMER_WSD_VAR_NAME(thread_list,gstcheck,g)())
 #else 
-IMPORT_C extern GList *thread_list;
+extern GList *thread_list;
 #endif
 
 //GMutex *mutex;
@@ -102,7 +93,7 @@
 GET_GLOBAL_VAR_FROM_TLS(mutex,gstcheck,GMutex*)
 #define mutex (*GET_GSTREAMER_WSD_VAR_NAME(mutex,gstcheck,g)())
 #else 
-IMPORT_C extern GMutex *mutex;
+extern GMutex *mutex;
 #endif
 
 //GCond *start_cond;              /* used to notify main thread of thread startups */
@@ -110,7 +101,7 @@
 static GET_GLOBAL_VAR_FROM_TLS(start_cond,gstcheck,GCond*)
 #define start_cond (*GET_GSTREAMER_WSD_VAR_NAME(start_cond,gstcheck,g)())
 #else 
-IMPORT_C extern GCond *start_cond;
+extern GCond *start_cond;
 #endif
 
 //GCond *sync_cond;               /* used to synchronize all threads and main thread */
@@ -118,7 +109,7 @@
 static GET_GLOBAL_VAR_FROM_TLS(sync_cond,gstcheck,GCond*)
 #define sync_cond (*GET_GSTREAMER_WSD_VAR_NAME(sync_cond,gstcheck,g)())
 #else 
-IMPORT_C extern GCond *sync_cond;
+extern GCond *sync_cond;
 #endif
 
 #include <gst/check/gstcheck.h>
@@ -392,7 +383,7 @@
   ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_LICENSE, "Licoo");
   ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_LICENSE_URI,
       "http://creativecommons.org/licenses/by/3.0/");
-  ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_GEO_LOCATION_NAME, "Bristol, UK");
+  ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_LOCATION, "Bristol, UK");
   ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_ORGANIZATION, "Orgoo");
   ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_GENRE, "Goo");
   ASSERT_TAG_LIST_HAS_STRING (list, GST_TAG_CONTACT, "Coo");