dbus-signature: Move static assertion outside test code

This always needs to be true, even if we're not embedding test goo
in the library. These static assertions have no runtime overhead, only
compile-time, so it's OK to make it unconditional.

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/dbus/dbus-signature.c b/dbus/dbus-signature.c
index 2df893c8716f696f13e04b2a484f99106d87cead..006ac6a5e7b3a10da002c35e03382dead6d6fd8b 100644 (file)
--- a/dbus/dbus-signature.c
+++ b/dbus/dbus-signature.c
@@ -40,6 +40,8 @@ typedef struct
   unsigned int in_array : 1; /**< true if we are a subiterator pointing to an array's element type */
 } DBusSignatureRealIter;
 
+_DBUS_STATIC_ASSERT (sizeof (DBusSignatureIter) >= sizeof (DBusSignatureRealIter));
+
 /** macro that checks whether a typecode is a container type */
 #define TYPE_IS_CONTAINER(typecode)             \
     ((typecode) == DBUS_TYPE_STRUCT ||          \
@@ -430,8 +432,6 @@ _dbus_signature_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
   const char *sig;
   dbus_bool_t boolres;
 
-  _DBUS_STATIC_ASSERT (sizeof (DBusSignatureIter) >= sizeof (DBusSignatureRealIter));
-
   sig = "";
   _dbus_assert (dbus_signature_validate (sig, NULL));
   _dbus_assert (!dbus_signature_validate_single (sig, NULL));