declare gboolean vtable_set static.

2001-07-31  Sven Neumann  <sven@gimp.org>

	* glib/gmem.c: declare gboolean vtable_set static.

diff --git a/ChangeLog b/ChangeLog
index 0044383..a2ed770 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-31  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmem.c: declare gboolean vtable_set static.
+
 2001-07-30  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c docs/reference/glib/glib-sections.txt

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0044383..a2ed770 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2001-07-31  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmem.c: declare gboolean vtable_set static.
+
 2001-07-30  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c docs/reference/glib/glib-sections.txt

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0044383..a2ed770 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2001-07-31  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmem.c: declare gboolean vtable_set static.
+
 2001-07-30  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c docs/reference/glib/glib-sections.txt

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0044383..a2ed770 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2001-07-31  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmem.c: declare gboolean vtable_set static.
+
 2001-07-30  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c docs/reference/glib/glib-sections.txt

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0044383..a2ed770 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2001-07-31  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmem.c: declare gboolean vtable_set static.
+
 2001-07-30  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c docs/reference/glib/glib-sections.txt

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0044383..a2ed770 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2001-07-31  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmem.c: declare gboolean vtable_set static.
+
 2001-07-30  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c docs/reference/glib/glib-sections.txt

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0044383..a2ed770 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2001-07-31  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmem.c: declare gboolean vtable_set static.
+
 2001-07-30  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c docs/reference/glib/glib-sections.txt

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0044383..a2ed770 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2001-07-31  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmem.c: declare gboolean vtable_set static.
+
 2001-07-30  Ron Steinke  <rsteinke@w-link.net>
 
        * glib/giochannel.c docs/reference/glib/glib-sections.txt

diff --git a/glib/gmem.c b/glib/gmem.c
index 616614b..225c960 100644 (file)
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -224,11 +224,11 @@ fallback_calloc (gsize n_blocks,
 void
 g_mem_set_vtable (GMemVTable *vtable)
 {
-  gboolean vtable_set = FALSE;
+  static gboolean vtable_set = FALSE;
 
   if (!vtable_set)
     {
-      vtable_set |= TRUE;
+      vtable_set = TRUE;
       if (vtable->malloc && vtable->realloc && vtable->free)
        {
          glib_mem_vtable.malloc = vtable->malloc;