From 66aaaf44ebf7a565076645bbf1e0c881f0501829 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <matthiasc@src.gnome.org>
Date: Thu, 11 Sep 2008 18:47:50 +0000
Subject: [PATCH] =?UTF-8?q?=20=20=20=20=20=20=20=20Bug=20548321=20?=
 =?UTF-8?q?=E2=80=93=20<string.h>=20is=20not=20included=20in=20gi18n-lib.h?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

        * 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=/branches/glib-2-16/; revision=7460
---
 ChangeLog        | 8 ++++++++
 glib/gi18n-lib.h | 1 +
 glib/gi18n.h     | 1 +
 3 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8b3bc1af2..13abf5eaf 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-11  Matthias Clasen  <mclasen@redhat.com>
 
 	Merge from trunk
diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h
index 9ba1f5165..674466e47 100644
--- a/glib/gi18n-lib.h
+++ b/glib/gi18n-lib.h
@@ -22,6 +22,7 @@
 #include <glib/gstrfuncs.h>
 
 #include <libintl.h>
+#include <string.h>
 
 #ifndef GETTEXT_PACKAGE
 #error You must define GETTEXT_PACKAGE before including gi18n-lib.h.
diff --git a/glib/gi18n.h b/glib/gi18n.h
index a5c829b57..c94e8c13d 100644
--- a/glib/gi18n.h
+++ b/glib/gi18n.h
@@ -21,6 +21,7 @@
 
 #include <glib/gstrfuncs.h>
 #include <libintl.h>
+#include <string.h>
 
 #define  _(String) gettext (String)
 #define Q_(String) g_dpgettext (NULL, String, 0)