From 88c7129340a594462ea2a78d714987ff45246662 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 14 Aug 2008 03:05:17 +0000 Subject: [PATCH] =?utf8?q?Bug=20547337=20=E2=80=93=20G=5FDISABLE=5FDEPRECA?= =?utf8?q?TED=20breaks=20tests=20build?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-08-13 Matthias Clasen Bug 547337 – G_DISABLE_DEPRECATED breaks tests build * tests/testglib.c: Protect deprecated API by ifdefs. Patch by Kalle Vahlman svn path=/trunk/; revision=7353 --- ChangeLog | 7 +++++++ tests/testglib.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0c9f0bc1..5835b6ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-13 Matthias Clasen + + Bug 547337 – G_DISABLE_DEPRECATED breaks tests build + + * tests/testglib.c: Protect deprecated API by ifdefs. + Patch by Kalle Vahlman + 2008-08-13 Matthias Clasen Bug 547637 – unconditional #include of sys/statfs.h in configure diff --git a/tests/testglib.c b/tests/testglib.c index 075460b1..8d3a59c6 100644 --- a/tests/testglib.c +++ b/tests/testglib.c @@ -1486,6 +1486,7 @@ various_string_tests (void) /* g_debug (argv[0]); */ } +#ifndef G_DISABLE_DEPRECATED static void test_mem_chunks (void) { @@ -1502,6 +1503,7 @@ test_mem_chunks (void) for (i = 0; i < 10000; i++) g_mem_chunk_free (mem_chunk, mem[i]); } +#endif int main (int argc, @@ -1523,7 +1525,9 @@ main (int argc, g_test_add_func ("/testglib/File Paths", test_paths); g_test_add_func ("/testglib/File Functions", test_file_functions); g_test_add_func ("/testglib/Parse Debug Strings", test_g_parse_debug_string); +#ifndef G_DISABLE_DEPRECATED g_test_add_func ("/testglib/GMemChunk (deprecated)", test_mem_chunks); +#endif g_test_add_func ("/testglib/Warnings & Errors", log_warning_error_tests); g_test_add_func ("/testglib/Timers (slow)", timer_tests); -- 2.34.1