X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-string-private.h;h=2e6de900fdc95e7278abe18b163cb13079cd26d9;hb=383f596c4aee2561c90abca3ce9d1f52407a3eec;hp=185515d8992fd4e318ab24b7a47ac8b91823f947;hpb=513f1379125c208197846dce135d1f886ebc3361;p=platform%2Fupstream%2Fdbus.git

diff --git a/dbus/dbus-string-private.h b/dbus/dbus-string-private.h
index 185515d..2e6de90 100644
--- a/dbus/dbus-string-private.h
+++ b/dbus/dbus-string-private.h
@@ -24,6 +24,7 @@
 #ifndef DBUS_STRING_PRIVATE_H
 #define DBUS_STRING_PRIVATE_H
 
+#include <dbus/dbus-internals.h>
 #include <dbus/dbus-memory.h>
 #include <dbus/dbus-types.h>
 
@@ -50,6 +51,7 @@ typedef struct
   unsigned int   align_offset : 3; /**< str - align_offset is the actual malloc block */
 } DBusRealString;
 
+_DBUS_STATIC_ASSERT (sizeof (DBusRealString) == sizeof (DBusString));
 
 /**
  * @defgroup DBusStringInternals DBusString implementation details
@@ -73,6 +75,7 @@ typedef struct
  */
 #define DBUS_GENERIC_STRING_PREAMBLE(real) \
   do { \
+      (void) real; /* might be unused unless asserting */ \
       _dbus_assert ((real) != NULL); \
       _dbus_assert (!(real)->invalid); \
       _dbus_assert ((real)->len >= 0); \