diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/tests/refcount/signals-multithread.c
--- a/glib/tsrc/BC/tests/refcount/signals-multithread.c	Wed Oct 13 19:39:18 2010 +0530
+++ b/glib/tsrc/BC/tests/refcount/signals-multithread.c	Thu Oct 14 14:15:50 2010 +0530
@@ -23,13 +23,12 @@
 guint gi;
 #endif /*SYMBIAN*/
 
-
-#define G_TYPE_TEST               (g_test_get_type ())
-#define G_TEST(test)              (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest))
-#define G_IS_TEST(test)           (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST))
-#define G_TEST_CLASS(tclass)      (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass))
-#define G_IS_TEST_CLASS(tclass)   (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
-#define G_TEST_GET_CLASS(test)    (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
+#define G_TYPE_TEST                (my_test_get_type ())
+#define MY_TEST(test)              (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest))
+#define MY_IS_TEST(test)           (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST))
+#define MY_TEST_CLASS(tclass)      (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass))
+#define MY_IS_TEST_CLASS(tclass)   (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST))
+#define MY_TEST_GET_CLASS(test)    (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass))
 
 static GRand *grand;
 
@@ -51,7 +50,7 @@
   void (*test_signal2) (GTest * test, gint an_int);
 };
 
-static GType g_test_get_type (void);
+static GType my_test_get_type (void);
 static volatile gboolean stopping;
 
 /* Element signals and args */
@@ -69,23 +68,23 @@
   ARG_TEST_PROP
 };
 
-static void g_test_class_init (GTestClass * klass);
-static void g_test_init (GTest * test);
-static void g_test_dispose (GObject * object);
+static void my_test_class_init (GTestClass * klass);
+static void my_test_init (GTest * test);
+static void my_test_dispose (GObject * object);
 
 static void signal2_handler (GTest * test, gint anint);
 
-static void g_test_set_property (GObject * object, guint prop_id,
+static void my_test_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
-static void g_test_get_property (GObject * object, guint prop_id,
+static void my_test_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
 static GObjectClass *parent_class = NULL;
 
-static guint g_test_signals[LAST_SIGNAL] = { 0 };
+static guint my_test_signals[LAST_SIGNAL] = { 0 };
 
 static GType
-g_test_get_type (void)
+my_test_get_type (void)
 {
   static GType test_type = 0;
 
@@ -94,12 +93,12 @@
       sizeof (GTestClass),
       NULL,
       NULL,
-      (GClassInitFunc) g_test_class_init,
+      (GClassInitFunc) my_test_class_init,
       NULL,
       NULL,
       sizeof (GTest),
       0,
-      (GInstanceInitFunc) g_test_init,
+      (GInstanceInitFunc) my_test_init,
       NULL
     };
 
@@ -112,7 +111,7 @@
 }
 
 static void
-g_test_class_init (GTestClass * klass)
+my_test_class_init (GTestClass * klass)
 {
   GObjectClass *gobject_class;
 
@@ -130,16 +129,15 @@
 #endif /*MULTITHREAD*/
 
 #endif /*SYMBAIN*/
+  gobject_class->dispose = my_test_dispose;
+  gobject_class->set_property = my_test_set_property;
+  gobject_class->get_property = my_test_get_property;
 
-  gobject_class->dispose = g_test_dispose;
-  gobject_class->set_property = g_test_set_property;
-  gobject_class->get_property = g_test_get_property;
-
-  g_test_signals[TEST_SIGNAL1] =
+  my_test_signals[TEST_SIGNAL1] =
       g_signal_new ("test-signal1", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GTestClass, test_signal1), NULL,
       NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-  g_test_signals[TEST_SIGNAL2] =
+  my_test_signals[TEST_SIGNAL2] =
       g_signal_new ("test-signal2", G_TYPE_FROM_CLASS (klass),
       G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GTestClass, test_signal2), NULL,
       NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
@@ -152,7 +150,7 @@
 }
 
 static void
-g_test_init (GTest * test)
+my_test_init (GTest * test)
 {
   #ifndef SYMBIAN
   g_print ("init %p\n", test);
@@ -168,11 +166,11 @@
 }
 
 static void
-g_test_dispose (GObject * object)
+my_test_dispose (GObject * object)
 {
   GTest *test;
 
-  test = G_TEST (object);
+  test = MY_TEST (object);
 
   g_print ("dispose %p!\n", object);
 
@@ -180,12 +178,12 @@
 }
 
 static void
-g_test_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
+my_test_set_property (GObject * object, guint prop_id,
+                      const GValue * value, GParamSpec * pspec)
 {
   GTest *test;
 
-  test = G_TEST (object);
+  test = MY_TEST (object);
 
   switch (prop_id) {
     case ARG_TEST_PROP:
@@ -198,12 +196,12 @@
 }
 
 static void
-g_test_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
+my_test_get_property (GObject * object, guint prop_id,
+                      GValue * value, GParamSpec * pspec)
 {
   GTest *test;
 
-  test = G_TEST (object);
+  test = MY_TEST (object);
 
   switch (prop_id) {
     case ARG_TEST_PROP:
@@ -216,9 +214,9 @@
 }
 
 static void
-g_test_do_signal1 (GTest * test)
+my_test_do_signal1 (GTest * test)
 {
-  g_signal_emit (G_OBJECT (test), g_test_signals[TEST_SIGNAL1], 0, 0);
+  g_signal_emit (G_OBJECT (test), my_test_signals[TEST_SIGNAL1], 0, 0);
 }
 
 static void
@@ -232,13 +230,13 @@
 }
 
 static void
-g_test_do_signal2 (GTest * test)
+my_test_do_signal2 (GTest * test)
 {
-  g_signal_emit (G_OBJECT (test), g_test_signals[TEST_SIGNAL2], 0, 0);
+  g_signal_emit (G_OBJECT (test), my_test_signals[TEST_SIGNAL2], 0, 0);
 }
 
 static void
-g_test_do_prop (GTest * test)
+my_test_do_prop (GTest * test)
 {
   test->value = g_rand_int (grand);
   g_object_notify (G_OBJECT (test), "test-prop");
@@ -253,14 +251,14 @@
   while (!stopping)
    {
     if (TESTNUM == 1)
-      g_test_do_signal1 (test);    
+      my_test_do_signal1 (test);
     if (TESTNUM == 2)
-      g_test_do_signal2 (test);
+      my_test_do_signal2 (test);
     if (TESTNUM == 3)
-      g_test_do_prop (test);
+      my_test_do_prop (test);
     if ((i++ % 10000) == 0) {
       g_print (".");
-     g_thread_yield();  /*force context switch */
+      g_thread_yield(); /* force context switch */
     }
    }
 #else
@@ -269,11 +267,11 @@
   while (!stopping)
    {
     if (TESTNUM == 1)
-      g_test_do_signal1 (test);
+      my_test_do_signal1 (test);
     if (TESTNUM == 2)
-      g_test_do_signal2 (test);
+      my_test_do_signal2 (test);
     if (TESTNUM == 3)
-      g_test_do_prop (test);
+      my_test_do_prop (test);
     if ((i++ % 10/*000*/) == 0) 
     {
     #ifdef VERBOSE
@@ -286,11 +284,11 @@
   for(i=0;i <= LOOP;i++)    
   {
     if (TESTNUM == 1)
-      g_test_do_signal1 (test);
+      my_test_do_signal1 (test);
     if (TESTNUM == 2)
-      g_test_do_signal2 (test);
+      my_test_do_signal2 (test);
     if (TESTNUM == 3)
-      g_test_do_prop (test);  
+      my_test_do_prop (test);  
     
     #ifdef 	VERBOSE
     g_print(".");
@@ -303,9 +301,6 @@
   return NULL;
 }
 
-
-
-
 static void
 notify (GObject *object, GParamSpec *spec, gpointer user_data)
 {
@@ -317,7 +312,7 @@
 	#endif
 
   g_object_get (object, "test-prop", &value, NULL);
-  //g_print ("+ %d", value);
+  /*g_print ("+ %d", value);*/
 }
 
 #ifdef SYMBIAN
@@ -341,7 +336,7 @@
   #ifdef SYMBIAN
   g_log_set_handler (NULL,  G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL);
   g_set_print_handler(mrtPrintHandler);
-  #endif /*SYMBIAN*/
+  #endif /*__SYMBIAN32__*/
 
   g_thread_init (NULL);
   
@@ -624,8 +619,8 @@
 
 
 handlernum=0;
-g_signal_emit(G_OBJECT (test1), g_test_signals[TEST_SIGNAL1], 0, 0);
-g_signal_emit(G_OBJECT (test2), g_test_signals[TEST_SIGNAL1], 0, 0);
+g_signal_emit(G_OBJECT (test1), my_test_signals[TEST_SIGNAL1], 0, 0);
+g_signal_emit(G_OBJECT (test2), my_test_signals[TEST_SIGNAL1], 0, 0);
 g_assert(handlernum==2);
 
 
@@ -636,8 +631,8 @@
 #endif
 
 handlernum=0;
-g_signal_emit (G_OBJECT (test1), g_test_signals[TEST_SIGNAL1], 0, 0);
-g_signal_emit (G_OBJECT (test2), g_test_signals[TEST_SIGNAL1], 0, 0);
+g_signal_emit (G_OBJECT (test1), my_test_signals[TEST_SIGNAL1], 0, 0);
+g_signal_emit (G_OBJECT (test2), my_test_signals[TEST_SIGNAL1], 0, 0);
 g_assert(handlernum==0);
 
 g_assert (strcmp ("test-signal1", g_signal_name (g_signal_lookup("test-signal1",G_TYPE_TEST))) == 0);
@@ -653,7 +648,7 @@
 g_assert(g_signal_lookup("test-signal1",G_TYPE_TEST)==gi);
 
 notifynum=0;
-g_signal_emitv (&gv, g_test_signals[TEST_SIGNAL1], 0, &gv);
+g_signal_emitv (&gv, my_test_signals[TEST_SIGNAL1], 0, &gv);
 g_assert(notifynum==1);
 
 g_signal_query(g_signal_lookup("test-signal1",G_TYPE_TEST),&gq);
@@ -671,7 +666,7 @@
 #endif /*MULTITHREAD*/
 
 #ifdef VERBOSE	
-g_printf ("\nsignals.c: Completed all tests\n");
+g_printf ("\nsignals-multithread: Completed all tests\n");
 #endif
 
 #endif /*SYMBIAN*/