only include printf_string_upper_bound() if HAVE_C99_VSNPRINTF is not

2001-12-28  Sven Neumann  <sven@gimp.org>

	* glib/gmessages.c: only include printf_string_upper_bound() if
	HAVE_C99_VSNPRINTF is not defined.

diff --git a/ChangeLog b/ChangeLog
index 8820a98..b657288 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-28  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmessages.c: only include printf_string_upper_bound() if
+       HAVE_C99_VSNPRINTF is not defined.
+
 2001-12-27  Duarte Loreto <happyguy_pt@hotmail.com>
 
         * configure.in: Added portuguese to ALL_LINGUAS

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8820a98..b657288 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-12-28  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmessages.c: only include printf_string_upper_bound() if
+       HAVE_C99_VSNPRINTF is not defined.
+
 2001-12-27  Duarte Loreto <happyguy_pt@hotmail.com>
 
         * configure.in: Added portuguese to ALL_LINGUAS

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8820a98..b657288 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-12-28  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmessages.c: only include printf_string_upper_bound() if
+       HAVE_C99_VSNPRINTF is not defined.
+
 2001-12-27  Duarte Loreto <happyguy_pt@hotmail.com>
 
         * configure.in: Added portuguese to ALL_LINGUAS

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8820a98..b657288 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2001-12-28  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmessages.c: only include printf_string_upper_bound() if
+       HAVE_C99_VSNPRINTF is not defined.
+
 2001-12-27  Duarte Loreto <happyguy_pt@hotmail.com>
 
         * configure.in: Added portuguese to ALL_LINGUAS

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8820a98..b657288 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-12-28  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmessages.c: only include printf_string_upper_bound() if
+       HAVE_C99_VSNPRINTF is not defined.
+
 2001-12-27  Duarte Loreto <happyguy_pt@hotmail.com>
 
         * configure.in: Added portuguese to ALL_LINGUAS

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8820a98..b657288 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-12-28  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmessages.c: only include printf_string_upper_bound() if
+       HAVE_C99_VSNPRINTF is not defined.
+
 2001-12-27  Duarte Loreto <happyguy_pt@hotmail.com>
 
         * configure.in: Added portuguese to ALL_LINGUAS

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8820a98..b657288 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-12-28  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmessages.c: only include printf_string_upper_bound() if
+       HAVE_C99_VSNPRINTF is not defined.
+
 2001-12-27  Duarte Loreto <happyguy_pt@hotmail.com>
 
         * configure.in: Added portuguese to ALL_LINGUAS

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8820a98..b657288 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-12-28  Sven Neumann  <sven@gimp.org>
+
+       * glib/gmessages.c: only include printf_string_upper_bound() if
+       HAVE_C99_VSNPRINTF is not defined.
+
 2001-12-27  Duarte Loreto <happyguy_pt@hotmail.com>
 
         * configure.in: Added portuguese to ALL_LINGUAS

diff --git a/glib/gmessages.c b/glib/gmessages.c
index 13b5cac..a3377ed 100644 (file)
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -71,9 +71,11 @@ struct _GLogHandler
 
 
 /* --- prototypes --- */
+#ifndef HAVE_C99_VSNPRINTF
 static gsize printf_string_upper_bound (const gchar *format,
                                        gboolean     may_warn,
                                        va_list      args);
+#endif /* !HAVE_C99_VSNPRINTF */
 
 
 /* --- variables --- */
@@ -860,6 +862,8 @@ g_printerr (const gchar *format,
 #  define MB_LEN_MAX 8
 #endif
 
+#ifndef HAVE_C99_VSNPRINTF
+
 typedef struct
 {
   guint min_width;
@@ -1168,6 +1172,9 @@ printf_string_upper_bound (const gchar *format,
   return len;
 }
 
+#endif /* !HAVE_C99_VSNPRINTF */
+
+
 gsize
 g_printf_string_upper_bound (const gchar *format,
                             va_list      args)