Trivial warning fix.

2004-04-22  Matthias Clasen  <mclasen@redhat.com>

	* tests/testglib.c (main): Trivial warning fix.

diff --git a/ChangeLog b/ChangeLog
index 54b41fcc00198a60c3be273bfce8ede5ceb5de3b..1075765c2ee164a1c38433a4eb9e9699f2a26c34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testglib.c (main): Trivial warning fix.  (#140345)
+
        * tests/queue-test.c (main): Add some tests for off-by-one errors.
 
        * glib/gqueue.c (g_queue_pop_nth_link): Fix an off-by-one 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 54b41fcc00198a60c3be273bfce8ede5ceb5de3b..1075765c2ee164a1c38433a4eb9e9699f2a26c34 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testglib.c (main): Trivial warning fix.  (#140345)
+
        * tests/queue-test.c (main): Add some tests for off-by-one errors.
 
        * glib/gqueue.c (g_queue_pop_nth_link): Fix an off-by-one 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 54b41fcc00198a60c3be273bfce8ede5ceb5de3b..1075765c2ee164a1c38433a4eb9e9699f2a26c34 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,7 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testglib.c (main): Trivial warning fix.  (#140345)
+
        * tests/queue-test.c (main): Add some tests for off-by-one errors.
 
        * glib/gqueue.c (g_queue_pop_nth_link): Fix an off-by-one 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 54b41fcc00198a60c3be273bfce8ede5ceb5de3b..1075765c2ee164a1c38433a4eb9e9699f2a26c34 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,7 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testglib.c (main): Trivial warning fix.  (#140345)
+
        * tests/queue-test.c (main): Add some tests for off-by-one errors.
 
        * glib/gqueue.c (g_queue_pop_nth_link): Fix an off-by-one 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 54b41fcc00198a60c3be273bfce8ede5ceb5de3b..1075765c2ee164a1c38433a4eb9e9699f2a26c34 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,7 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testglib.c (main): Trivial warning fix.  (#140345)
+
        * tests/queue-test.c (main): Add some tests for off-by-one errors.
 
        * glib/gqueue.c (g_queue_pop_nth_link): Fix an off-by-one 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 54b41fcc00198a60c3be273bfce8ede5ceb5de3b..1075765c2ee164a1c38433a4eb9e9699f2a26c34 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,7 @@
 2004-04-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * tests/testglib.c (main): Trivial warning fix.  (#140345)
+
        * tests/queue-test.c (main): Add some tests for off-by-one errors.
 
        * glib/gqueue.c (g_queue_pop_nth_link): Fix an off-by-one 

diff --git a/tests/testglib.c b/tests/testglib.c
index 4c9cc4125a303a8c6eb78f8de1eb01d52b642479..76bd04552a97bdb086095b556c4ddf37cbb9d83f 100644 (file)
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -1245,7 +1245,7 @@ main (int   argc,
 
   g_print ("ok\n");
 
-  if (g_get_charset (&charset))
+  if (g_get_charset ((G_CONST_RETURN char**)&charset))
     g_print ("current charset is UTF-8: %s\n", charset);
   else
     g_print ("current charset is not UTF-8: %s\n", charset);