Make it compile. (#119337, self.)

2003-11-05  Morten Welinder  <terra@gnome.org>

	* glib/garray.c (g_ptr_array_remove_range): Make it compile.
	(#119337, self.)

diff --git a/ChangeLog b/ChangeLog
index d229e38bca22ce9fa9aa73bf0acc8d0ec3da0fab..7f357fd5e292288bbee1d9f651b24f83004dc433 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-11-05  Morten Welinder  <terra@gnome.org>
 
+       * glib/garray.c (g_ptr_array_remove_range): Make it compile.
+       (#119337, self.)
+
        * glib/gstring.c (g_string_insert_len): Handle the case where the
        to-be-inserted string is a substring of the target string.
        (g_string_assign): Handle "s = s;".

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d229e38bca22ce9fa9aa73bf0acc8d0ec3da0fab..7f357fd5e292288bbee1d9f651b24f83004dc433 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2003-11-05  Morten Welinder  <terra@gnome.org>
 
+       * glib/garray.c (g_ptr_array_remove_range): Make it compile.
+       (#119337, self.)
+
        * glib/gstring.c (g_string_insert_len): Handle the case where the
        to-be-inserted string is a substring of the target string.
        (g_string_assign): Handle "s = s;".

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d229e38bca22ce9fa9aa73bf0acc8d0ec3da0fab..7f357fd5e292288bbee1d9f651b24f83004dc433 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,5 +1,8 @@
 2003-11-05  Morten Welinder  <terra@gnome.org>
 
+       * glib/garray.c (g_ptr_array_remove_range): Make it compile.
+       (#119337, self.)
+
        * glib/gstring.c (g_string_insert_len): Handle the case where the
        to-be-inserted string is a substring of the target string.
        (g_string_assign): Handle "s = s;".

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d229e38bca22ce9fa9aa73bf0acc8d0ec3da0fab..7f357fd5e292288bbee1d9f651b24f83004dc433 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,8 @@
 2003-11-05  Morten Welinder  <terra@gnome.org>
 
+       * glib/garray.c (g_ptr_array_remove_range): Make it compile.
+       (#119337, self.)
+
        * glib/gstring.c (g_string_insert_len): Handle the case where the
        to-be-inserted string is a substring of the target string.
        (g_string_assign): Handle "s = s;".

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d229e38bca22ce9fa9aa73bf0acc8d0ec3da0fab..7f357fd5e292288bbee1d9f651b24f83004dc433 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2003-11-05  Morten Welinder  <terra@gnome.org>
 
+       * glib/garray.c (g_ptr_array_remove_range): Make it compile.
+       (#119337, self.)
+
        * glib/gstring.c (g_string_insert_len): Handle the case where the
        to-be-inserted string is a substring of the target string.
        (g_string_assign): Handle "s = s;".

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d229e38bca22ce9fa9aa73bf0acc8d0ec3da0fab..7f357fd5e292288bbee1d9f651b24f83004dc433 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2003-11-05  Morten Welinder  <terra@gnome.org>
 
+       * glib/garray.c (g_ptr_array_remove_range): Make it compile.
+       (#119337, self.)
+
        * glib/gstring.c (g_string_insert_len): Handle the case where the
        to-be-inserted string is a substring of the target string.
        (g_string_assign): Handle "s = s;".

diff --git a/glib/garray.c b/glib/garray.c
index 75ec5d5f83d4db89dd58d3a07f4ef6002225b7fe..e38a5a77cdcd39d4b76f931561fc0e0ed1961069 100644 (file)
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -550,7 +550,11 @@ g_ptr_array_remove_range (GPtrArray* farray,
 
   array->len -= length;
 #ifdef ENABLE_GC_FRIENDLY
-  g_array_elt_zero (array->pdata, array->len, length);
+  {
+    guint i;
+    for (i = 0; i < length; i++)
+      array->pdata[array->len + i] = NULL;
+  }
 #endif /* ENABLE_GC_FRIENDLY */
 }