[kdbus] Add SipHash algorithm

[platform/upstream/glib.git] / glib / deprecated / gallocator.h

diff --git a/glib/deprecated/gallocator.h b/glib/deprecated/gallocator.h
index 7929e48..3985075 100644 (file)
--- a/glib/deprecated/gallocator.h
+++ b/glib/deprecated/gallocator.h
@@ -10,18 +10,16 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#if defined(G_DISABLE_SINGLE_INCLUDES) && !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
-#error "Only <glib.h> can be included directly."
-#endif
-
 #ifndef __G_ALLOCATOR_H__
 #define __G_ALLOCATOR_H__
 
+#if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
+#error "Only <glib.h> can be included directly."
+#endif
+
 #include <glib/gtypes.h>
 
 G_BEGIN_DECLS
@@ -41,30 +39,48 @@ typedef struct _GMemChunk  GMemChunk;
 #define g_mem_chunk_create(type, x, y)  (g_mem_chunk_new (NULL, sizeof (type), 0, 0))
 
 
+GLIB_DEPRECATED
 GMemChunk *     g_mem_chunk_new         (const gchar  *name,
                                          gint          atom_size,
                                          gsize         area_size,
                                          gint          type);
+GLIB_DEPRECATED
 void            g_mem_chunk_destroy     (GMemChunk    *mem_chunk);
+GLIB_DEPRECATED
 gpointer        g_mem_chunk_alloc       (GMemChunk    *mem_chunk);
+GLIB_DEPRECATED
 gpointer        g_mem_chunk_alloc0      (GMemChunk    *mem_chunk);
+GLIB_DEPRECATED
 void            g_mem_chunk_free        (GMemChunk    *mem_chunk,
                                          gpointer      mem);
+GLIB_DEPRECATED
 void            g_mem_chunk_clean       (GMemChunk    *mem_chunk);
+GLIB_DEPRECATED
 void            g_mem_chunk_reset       (GMemChunk    *mem_chunk);
+GLIB_DEPRECATED
 void            g_mem_chunk_print       (GMemChunk    *mem_chunk);
+GLIB_DEPRECATED
 void            g_mem_chunk_info        (void);
+GLIB_DEPRECATED
 void            g_blow_chunks           (void);
 
 
+GLIB_DEPRECATED
 GAllocator *    g_allocator_new         (const gchar  *name,
                                          guint         n_preallocs);
+GLIB_DEPRECATED
 void            g_allocator_free        (GAllocator   *allocator);
+GLIB_DEPRECATED
 void            g_list_push_allocator   (GAllocator   *allocator);
+GLIB_DEPRECATED
 void            g_list_pop_allocator    (void);
+GLIB_DEPRECATED
 void            g_slist_push_allocator  (GAllocator   *allocator);
+GLIB_DEPRECATED
 void            g_slist_pop_allocator   (void);
+GLIB_DEPRECATED
 void            g_node_push_allocator   (GAllocator   *allocator);
+GLIB_DEPRECATED
 void            g_node_pop_allocator    (void);
 
 G_END_DECLS