Remove g_snprintf() and g_vsnprintf(), since they are already declared in

2005-09-26  Matthias Clasen  <mclasen@redhat.com>

	* glib/gprintf.h: Remove g_snprintf() and g_vsnprintf(), since
	they are already declared in glib.h. This doesn't break documented
	use of gprintf.h, but should probably be pointed out in the
	release notes for 2.10. (#314232, Behdad Esfahbod)

diff --git a/ChangeLog b/ChangeLog
index 01136a8..3a7ee3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols:
+       * glib/gprintf.h: Remove g_snprintf() and g_vsnprintf(), since
+       they are already declared in glib.h. This doesn't break documented
+       use of gprintf.h, but should probably be pointed out in the 
+       release notes for 2.10. (#314232, Behdad Esfahbod)
+
 Tue Sep 20 13:16:04 2005  Tim Janik  <timj@imendio.com>
 
        * glib/gpattern.c (g_pattern_ph_match): applied significant recursion

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 01136a8..3a7ee3d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-09-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols:
+       * glib/gprintf.h: Remove g_snprintf() and g_vsnprintf(), since
+       they are already declared in glib.h. This doesn't break documented
+       use of gprintf.h, but should probably be pointed out in the 
+       release notes for 2.10. (#314232, Behdad Esfahbod)
+
 Tue Sep 20 13:16:04 2005  Tim Janik  <timj@imendio.com>
 
        * glib/gpattern.c (g_pattern_ph_match): applied significant recursion

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 01136a8..3a7ee3d 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2005-09-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/glib.symbols:
+       * glib/gprintf.h: Remove g_snprintf() and g_vsnprintf(), since
+       they are already declared in glib.h. This doesn't break documented
+       use of gprintf.h, but should probably be pointed out in the 
+       release notes for 2.10. (#314232, Behdad Esfahbod)
+
 Tue Sep 20 13:16:04 2005  Tim Janik  <timj@imendio.com>
 
        * glib/gpattern.c (g_pattern_ph_match): applied significant recursion

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 8170aaf..85a7b13 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -290,8 +290,10 @@ g_hash_table_foreach_steal
 g_hash_table_insert
 g_hash_table_lookup
 g_hash_table_lookup_extended
+#ifdef G_UNDEFINED
 g_hash_table_new
 g_hash_table_new_full
+#endif
 g_hash_table_remove
 g_hash_table_replace
 g_hash_table_size
@@ -461,10 +463,6 @@ g_list_length
 g_list_nth
 g_list_nth_data
 g_list_nth_prev
-#ifndef DISABLE_MEM_POOLS
-g_list_pop_allocator
-g_list_push_allocator
-#endif
 g_list_position
 g_list_prepend
 g_list_remove
@@ -635,10 +633,6 @@ g_node_n_children
 g_node_new
 g_node_n_nodes
 g_node_nth_child
-#ifndef DISABLE_MEM_POOLS
-g_node_pop_allocator
-g_node_push_allocator
-#endif
 g_node_prepend
 g_node_reverse_children
 g_node_traverse
@@ -692,15 +686,20 @@ g_spaced_primes_closest G_GNUC_CONST
 g_fprintf G_GNUC_PRINTF(2,3)
 g_printf G_GNUC_PRINTF(1,2)
 g_sprintf G_GNUC_PRINTF(2,3)
-g_snprintf G_GNUC_PRINTF(3,4)
 g_vasprintf
 g_vfprintf
 g_vprintf
-g_vsnprintf
 g_vsprintf
 #endif
 #endif
 
+#if IN_HEADER(__G_UTILS_H__)
+#if IN_FILE(__G_PRINTF_C__)
+g_snprintf G_GNUC_PRINTF(3,4)
+g_vsnprintf
+#endif
+#endif
+
 #if IN_HEADER(__G_QSORT_H__)
 #if IN_FILE(__G_QSORT_C__)
 g_qsort_with_data
@@ -841,10 +840,6 @@ g_slist_last
 g_slist_length
 g_slist_nth
 g_slist_nth_data
-#ifndef DISABLE_MEM_POOLS
-g_slist_pop_allocator
-g_slist_push_allocator
-#endif
 g_slist_position
 g_slist_prepend
 g_slist_remove

diff --git a/glib/gprintf.h b/glib/gprintf.h
index 0226f22..aa542b3 100644 (file)
--- a/glib/gprintf.h
+++ b/glib/gprintf.h
@@ -33,10 +33,6 @@ gint                  g_fprintf   (FILE        *file,
 gint                  g_sprintf   (gchar       *string,
                                   gchar const *format,
                                   ...) G_GNUC_PRINTF (2, 3);
-gint                  g_snprintf  (gchar       *string,
-                                  gulong       n,
-                                  gchar const *format,
-                                  ...) G_GNUC_PRINTF (3, 4);
 
 gint                  g_vprintf   (gchar const *format,
                                    va_list      args);            
@@ -46,10 +42,6 @@ gint                  g_vfprintf  (FILE        *file,
 gint                  g_vsprintf  (gchar       *string,
                                   gchar const *format,
                                   va_list      args);
-gint                  g_vsnprintf (gchar       *string,
-                                  gulong       n,
-                                  gchar const *format,
-                                  va_list      args);
 gint                  g_vasprintf (gchar      **string,
                                   gchar const *format,
                                   va_list      args);