Shuffle lines to avoid gcc 3 warning about redundant redeclaration

Signed-off-by: Blue Swirl <[email protected]>

diff --git a/qdict.c b/qdict.c
index cffd23d3239b4798609f29204a702a7259d6d4a3..ecc266e48807cfbef13df99bec9e72cc76de8b29 100644 (file)
--- 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 9a56906895a873c5d14c725d2f569adf9f635166..447e847af3d9f5aacd68374fbb2d0f28cc0ac06f 100644 (file)
--- 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 9fa2e3024eddff618c1d4f113901144758212881..6d411da7b7eeed5362d29b6fef5cd4bafa4cc7ed 100644 (file)
--- 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,
-};