glib/gmem.c (g_mem_is_system_malloc): Return !vtable_set.

docs/reference/glib/glib-sections.txt: Add g_mem_is_system_malloc.

diff --git a/ChangeLog b/ChangeLog
index 2ac02be..52f2abc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * gmem.c (g_mem_is_system_malloc): Return !vtable_set.
+
 2001-09-26  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Retract my change earlier today. Don't preset

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2ac02be..52f2abc 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2001-09-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * gmem.c (g_mem_is_system_malloc): Return !vtable_set.
+
 2001-09-26  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Retract my change earlier today. Don't preset

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2ac02be..52f2abc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2001-09-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * gmem.c (g_mem_is_system_malloc): Return !vtable_set.
+
 2001-09-26  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Retract my change earlier today. Don't preset

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2ac02be..52f2abc 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2001-09-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * gmem.c (g_mem_is_system_malloc): Return !vtable_set.
+
 2001-09-26  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Retract my change earlier today. Don't preset

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2ac02be..52f2abc 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2001-09-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * gmem.c (g_mem_is_system_malloc): Return !vtable_set.
+
 2001-09-26  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Retract my change earlier today. Don't preset

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2ac02be..52f2abc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2001-09-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * gmem.c (g_mem_is_system_malloc): Return !vtable_set.
+
 2001-09-26  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Retract my change earlier today. Don't preset

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2ac02be..52f2abc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2001-09-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * gmem.c (g_mem_is_system_malloc): Return !vtable_set.
+
 2001-09-26  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Retract my change earlier today. Don't preset

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2ac02be..52f2abc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2001-09-26  Matthias Clasen  <matthiasc@poet.de>
+
+       * gmem.c (g_mem_is_system_malloc): Return !vtable_set.
+
 2001-09-26  Tor Lillqvist  <tml@iki.fi>
 
        * configure.in: Retract my change earlier today. Don't preset

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 8a0c74a..084c1f0 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,6 +1,10 @@
+2001-09-26  Matthias Clasen <matthiasc@poet.de>
+
+       * glib/glib-sections.txt: Add g_mem_is_system_malloc.
+
 2001-09-25  Matthias Clasen <matthiasc@poet.de>
 
-       * glib/glib-section.txt: Add a missing SECTION 
+       * glib/glib-sections.txt: Add a missing SECTION 
        endtag. (#61126)
 
 2001-09-17  Darin Adler  <darin@bentspoon.com>

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index a76f031..26e233d 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -704,11 +704,11 @@ g_memdup
 <SUBSECTION>
 GMemVTable
 g_mem_set_vtable
+g_mem_is_system_malloc
 
 <SUBSECTION>
 glib_mem_profiler_table
 g_mem_profile
-
 </SECTION>
 
 <SECTION>

diff --git a/glib/gmem.c b/glib/gmem.c
index 43623aa..4753b0b 100644 (file)
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -228,18 +228,19 @@ static gboolean vtable_set = FALSE;
  * 
  * Checks whether the allocator used by g_malloc() is the system's
  * malloc implementation. If it returns %TRUE memory allocated with
- * malloc() can be used interchangeable with memory allocated using
- * g_malloc(). This function is useful for avoiding an extra copy
- * of allocated memory returned by a non-GLib-based API.
+ * <function>malloc()</function> can be used interchangeable with 
+ * memory allocated using g_malloc(). This function is useful for 
+ * avoiding an extra copy of allocated memory returned by a 
+ * non-GLib-based API.
  *
  * A different allocator can be set using g_mem_set_vtable().
  *
- * Return value: if %TRUE, malloc() and g_malloc() can be mixed.
+ * Return value: if %TRUE, <function>malloc()</function> and g_malloc() can be mixed.
  **/
 gboolean
 g_mem_is_system_malloc (void)
 {
-  return vtable_set;
+  return !vtable_set;
 }
 
 void