From dc85674b572227985da075490659d9399a7fd598 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 11 Sep 2008 16:48:44 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20548321=20=E2=80=93=20<string.h>=20is=20no?=
 =?UTF-8?q?t=20included=20in=20gi18n-lib.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2008-09-11  Matthias Clasen  <mclasen@redhat.com>

        Bug 548321 – <string.h> is not included in gi18n-lib.h

        * glib/gi18n.h:
        * glib/gi18n-lib.h: Include string.h, since strlen is used in
        the macros. Pointed out by Ignacio Casal Quinteiro


svn path=/trunk/; revision=7455
---
 ChangeLog        | 8 ++++++++
 glib/gi18n-lib.h | 1 +
 glib/gi18n.h     | 1 +
 3 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index e9fb7ebbe..d053c3455 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-11  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 548321 – <string.h> is not included in gi18n-lib.h
+
+	* glib/gi18n.h:
+	* glib/gi18n-lib.h: Include string.h, since strlen is used in 
+	the macros. Pointed out by Ignacio Casal Quinteiro
+
 2008-09-10  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 551731 – g_date_set_time[_t] docs should mention what timezone
diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h
index 105f4d142..ca002a722 100644
--- a/glib/gi18n-lib.h
+++ b/glib/gi18n-lib.h
@@ -23,6 +23,7 @@
 #include <glib.h>
 
 #include <libintl.h>
+#include <string.h>
 
 #ifndef GETTEXT_PACKAGE
 #error You must define GETTEXT_PACKAGE before including gi18n-lib.h.  Did you forget to include config.h?
diff --git a/glib/gi18n.h b/glib/gi18n.h
index b83554644..c710046ee 100644
--- a/glib/gi18n.h
+++ b/glib/gi18n.h
@@ -23,6 +23,7 @@
 #include <glib.h>
 
 #include <libintl.h>
+#include <string.h>
 
 #define  _(String) gettext (String)
 #define Q_(String) g_dpgettext (NULL, String, 0)