-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-memory.h D-BUS memory handling
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/* dbus-memory.h D-Bus memory handling
*
* Copyright (C) 2002 Red Hat Inc.
*
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.1
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
#define DBUS_MEMORY_H
#include <dbus/dbus-macros.h>
-#include <sys/types.h> /* for size_t - is there a better header for this? */
+#include <stddef.h>
DBUS_BEGIN_DECLS
+/**
+ * @addtogroup DBusMemory
+ * @{
+ */
+
+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);
+
+/** @} */
+
DBUS_END_DECLS
-#endif /* DBUS_MESSAGE_H */
+#endif /* DBUS_MEMORY_H */