From: Bruno Haible <bruno@clisp.org>
Date: Thu, 4 Sep 2003 20:58:51 +0000 (+0000)
Subject: Fix a warning on Solaris.
X-Git-Tag: v0.13~273
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43d535f696dc74dd8156966f0032b0f9d959041f;p=thirdparty%2Fgettext.git

Fix a warning on Solaris.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 4bc99ac38..426f63a06 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-04  Bruno Haible  <bruno@clisp.org>
+
+	* dgettext.c: Include <locale.h> after gettextP.h, not before. This
+	ensures that libintl_dcgettext is correctly declared on Solaris.
+	(Needed because Solaris <locale.h> includes libintl.h.)
+	* dngettext.c: Likewise, for the libintl_dcngettext declaration.
+
 2003-08-29  Bruno Haible  <bruno@clisp.org>
 
 	* vasnprintf.c: Test HAVE_DECL__SNPRINTF instead of HAVE__SNPRINTF.
diff --git a/gettext-runtime/intl/dgettext.c b/gettext-runtime/intl/dgettext.c
index cf5b4037f..737e42055 100644
--- a/gettext-runtime/intl/dgettext.c
+++ b/gettext-runtime/intl/dgettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -20,9 +20,10 @@
 # include <config.h>
 #endif
 
+#include "gettextP.h"
+
 #include <locale.h>
 
-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else
diff --git a/gettext-runtime/intl/dngettext.c b/gettext-runtime/intl/dngettext.c
index 67fd030f2..4101c2836 100644
--- a/gettext-runtime/intl/dngettext.c
+++ b/gettext-runtime/intl/dngettext.c
@@ -1,5 +1,5 @@
 /* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997, 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
    under the terms of the GNU Library General Public License as published
@@ -20,9 +20,10 @@
 # include <config.h>
 #endif
 
+#include "gettextP.h"
+
 #include <locale.h>
 
-#include "gettextP.h"
 #ifdef _LIBC
 # include <libintl.h>
 #else