Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...

[platform/upstream/dbus.git] / dbus / dbus-memory.h

diff --git a/dbus/dbus-memory.h b/dbus/dbus-memory.h
index d0e92d1..4fd56bd 100644 (file)
--- a/dbus/dbus-memory.h
+++ b/dbus/dbus-memory.h
@@ -37,19 +37,33 @@ DBUS_BEGIN_DECLS
  * @{
  */
 
+DBUS_EXPORT
+DBUS_MALLOC
+DBUS_ALLOC_SIZE(1)
 void* dbus_malloc        (size_t bytes);
+
+DBUS_EXPORT
+DBUS_MALLOC
+DBUS_ALLOC_SIZE(1)
 void* dbus_malloc0       (size_t bytes);
+
+DBUS_EXPORT
+DBUS_MALLOC
+DBUS_ALLOC_SIZE(2)
 void* dbus_realloc       (void  *memory,
                           size_t bytes);
+DBUS_EXPORT
 void  dbus_free          (void  *memory);
 
-#define dbus_new(type, count)  ((type*)dbus_malloc (sizeof (type) * (count)));
-#define dbus_new0(type, count) ((type*)dbus_malloc0 (sizeof (type) * (count)));
+#define dbus_new(type, count)  ((type*)dbus_malloc (sizeof (type) * (count)))
+#define dbus_new0(type, count) ((type*)dbus_malloc0 (sizeof (type) * (count)))
 
+DBUS_EXPORT
 void dbus_free_string_array (char **str_array);
 
 typedef void (* DBusFreeFunction) (void *memory);
 
+DBUS_EXPORT
 void dbus_shutdown (void);
 
 /** @} */