From: Simon McVittie <smcv@collabora.com>
Date: Fri, 28 Sep 2018 15:57:13 +0000 (+0100)
Subject: dbus-signature: Move static assertion outside test code
X-Git-Tag: dbus-1.13.10~25^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cc474a5de4cd925d3d21f7f7003edaa657ab084;p=thirdparty%2Fdbus.git

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 2df893c87..006ac6a5e 100644
--- 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));