summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-12-26 04:59:34 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-12-26 04:59:34 +0000
commit47d2ef18ea6ebfc8b35b6bc57883c73522c5eb8d (patch)
treec26009e8686e916b5e829b278eebedfa50f92148
parente60d241988d7584cd6cde1d90e461750b9da4939 (diff)
downloadglib-47d2ef18ea6ebfc8b35b6bc57883c73522c5eb8d.tar.gz
glib-47d2ef18ea6ebfc8b35b6bc57883c73522c5eb8d.tar.bz2
glib-47d2ef18ea6ebfc8b35b6bc57883c73522c5eb8d.zip
Fix C99isms. (#324950, Dan Yefimov)
2005-12-25 Matthias Clasen <mclasen@redhat.com> * tests/slice-test.c: Fix C99isms. (#324950, Dan Yefimov)
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-124
-rw-r--r--tests/slice-test.c11
4 files changed, 19 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 317ccc343..58199c303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-25 Matthias Clasen <mclasen@redhat.com>
+
+ * tests/slice-test.c: Fix C99isms. (#324950, Dan Yefimov)
+
2005-12-21 Matthias Clasen <mclasen@redhat.com>
* README.in: Add some notes on when 'make check' may fail.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 317ccc343..58199c303 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2005-12-25 Matthias Clasen <mclasen@redhat.com>
+
+ * tests/slice-test.c: Fix C99isms. (#324950, Dan Yefimov)
+
2005-12-21 Matthias Clasen <mclasen@redhat.com>
* README.in: Add some notes on when 'make check' may fail.
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 317ccc343..58199c303 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2005-12-25 Matthias Clasen <mclasen@redhat.com>
+
+ * tests/slice-test.c: Fix C99isms. (#324950, Dan Yefimov)
+
2005-12-21 Matthias Clasen <mclasen@redhat.com>
* README.in: Add some notes on when 'make check' may fail.
diff --git a/tests/slice-test.c b/tests/slice-test.c
index f0b5b20af..1390efccc 100644
--- a/tests/slice-test.c
+++ b/tests/slice-test.c
@@ -70,6 +70,10 @@ memchunk_free (GMemChunk *memchunk,
static gpointer
test_memchunk_thread (gpointer data)
{
+ GMemChunk **memchunks;
+ guint i, j;
+ guint8 **ps;
+ guint *ss;
guint32 rand_accu = 2147483563;
/* initialize random numbers */
if (data)
@@ -82,12 +86,11 @@ test_memchunk_thread (gpointer data)
}
/* prepare for memchunk creation */
- GMemChunk **memchunks = g_alloca (sizeof (memchunks[0]) * prime_size);
+ memchunks = g_alloca (sizeof (memchunks[0]) * prime_size);
memset (memchunks, 0, sizeof (memchunks[0]) * prime_size);
- guint i, j;
- guint8 **ps = g_new (guint8*, number_of_blocks);
- guint *ss = g_new (guint, number_of_blocks);
+ ps = g_new (guint8*, number_of_blocks);
+ ss = g_new (guint, number_of_blocks);
/* create number_of_blocks random sizes */
for (i = 0; i < number_of_blocks; i++)
ss[i] = quick_rand32() % prime_size;