Include string.h, supress a warning.

[platform/upstream/glib.git] / glib / gmem.h

diff --git a/glib/gmem.h b/glib/gmem.h
index 2ba1344..9d5b418 100644 (file)
--- a/glib/gmem.h
+++ b/glib/gmem.h
@@ -27,7 +27,7 @@
 #ifndef __G_MEM_H__
 #define __G_MEM_H__
 
-#include <gtypes.h>
+#include <glib/gtypes.h>
 
 G_BEGIN_DECLS
 
@@ -83,11 +83,11 @@ struct _GMemVTable
                           gsize    n_bytes);
 };
 void    g_mem_set_vtable (GMemVTable   *vtable);
-
+gboolean g_mem_is_system_malloc (void);
 
 /* Memory profiler and checker, has to be enabled via g_mem_set_vtable()
  */
-extern GMemVTable      *glib_mem_profiler_table;
+GLIB_VAR GMemVTable    *glib_mem_profiler_table;
 void   g_mem_profile   (void);
 
 
@@ -132,19 +132,19 @@ void      g_mem_profile   (void);
 #define G_ALLOC_ONLY     1
 #define G_ALLOC_AND_FREE  2
 
-GMemChunk* g_mem_chunk_new     (gchar    *name,
-                               gint       atom_size,
-                               gulong     area_size,
-                               gint       type);
-void      g_mem_chunk_destroy (GMemChunk *mem_chunk);
-gpointer   g_mem_chunk_alloc   (GMemChunk *mem_chunk);
-gpointer   g_mem_chunk_alloc0  (GMemChunk *mem_chunk);
-void      g_mem_chunk_free    (GMemChunk *mem_chunk,
-                               gpointer   mem);
-void      g_mem_chunk_clean   (GMemChunk *mem_chunk);
-void      g_mem_chunk_reset   (GMemChunk *mem_chunk);
-void      g_mem_chunk_print   (GMemChunk *mem_chunk);
-void      g_mem_chunk_info    (void);
+GMemChunk* g_mem_chunk_new     (const gchar *name,
+                               gint         atom_size,
+                               gulong       area_size,
+                               gint         type);
+void       g_mem_chunk_destroy (GMemChunk   *mem_chunk);
+gpointer   g_mem_chunk_alloc   (GMemChunk   *mem_chunk);
+gpointer   g_mem_chunk_alloc0  (GMemChunk   *mem_chunk);
+void       g_mem_chunk_free    (GMemChunk   *mem_chunk,
+                               gpointer     mem);
+void       g_mem_chunk_clean   (GMemChunk   *mem_chunk);
+void       g_mem_chunk_reset   (GMemChunk   *mem_chunk);
+void       g_mem_chunk_print   (GMemChunk   *mem_chunk);
+void       g_mem_chunk_info    (void);
 
 /* Ah yes...we have a "g_blow_chunks" function.
  * "g_blow_chunks" simply compresses all the chunks. This operation