summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2009-09-04 17:43:37 +0000
committerBlue Swirl <blauwirbel@gmail.com>2009-09-04 17:43:37 +0000
commitaa43d9ccab056a371426de6d0606dacaf1b6296c (patch)
tree18308fe85ffb82bfd11ecbf8cdda0524eed889a2
parentc34ebfdc8715f03d53e154758423c902324fee06 (diff)
downloadqemu-aa43d9ccab056a371426de6d0606dacaf1b6296c.tar.gz
Shuffle lines to avoid gcc 3 warning about redundant redeclaration
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--qdict.c12
-rw-r--r--qint.c12
-rw-r--r--qstring.c12
3 files changed, 18 insertions, 18 deletions
diff --git a/qdict.c b/qdict.c
index cffd23d323..ecc266e488 100644
--- a/qdict.c
+++ b/qdict.c
@@ -17,7 +17,12 @@
#include "sys-queue.h"
#include "qemu-common.h"
-static const QType qdict_type;
+static void qdict_destroy_obj(QObject *obj);
+
+static const QType qdict_type = {
+ .code = QTYPE_QDICT,
+ .destroy = qdict_destroy_obj,
+};
/**
* qdict_new(): Create a new QDict
@@ -290,8 +295,3 @@ static void qdict_destroy_obj(QObject *obj)
qemu_free(qdict);
}
-
-static const QType qdict_type = {
- .code = QTYPE_QDICT,
- .destroy = qdict_destroy_obj,
-};
diff --git a/qint.c b/qint.c
index 9a56906895..447e847af3 100644
--- a/qint.c
+++ b/qint.c
@@ -13,7 +13,12 @@
#include "qobject.h"
#include "qemu-common.h"
-static const QType qint_type;
+static void qint_destroy_obj(QObject *obj);
+
+static const QType qint_type = {
+ .code = QTYPE_QINT,
+ .destroy = qint_destroy_obj,
+};
/**
* qint_from_int(): Create a new QInt from an int64_t
@@ -59,8 +64,3 @@ static void qint_destroy_obj(QObject *obj)
assert(obj != NULL);
qemu_free(qobject_to_qint(obj));
}
-
-static const QType qint_type = {
- .code = QTYPE_QINT,
- .destroy = qint_destroy_obj,
-};
diff --git a/qstring.c b/qstring.c
index 9fa2e3024e..6d411da7b7 100644
--- a/qstring.c
+++ b/qstring.c
@@ -13,7 +13,12 @@
#include "qstring.h"
#include "qemu-common.h"
-static const QType qstring_type;
+static void qstring_destroy_obj(QObject *obj);
+
+static const QType qstring_type = {
+ .code = QTYPE_QSTRING,
+ .destroy = qstring_destroy_obj,
+};
/**
* qstring_from_str(): Create a new QString from a regular C string
@@ -66,8 +71,3 @@ static void qstring_destroy_obj(QObject *obj)
qemu_free(qs->string);
qemu_free(qs);
}
-
-static const QType qstring_type = {
- .code = QTYPE_QSTRING,
- .destroy = qstring_destroy_obj,
-};