From: Bruno Haible <bruno@clisp.org>
Date: Mon, 20 Apr 2020 01:56:48 +0000 (+0200)
Subject: build: Fix a warning (regression from 2020-01-05).
X-Git-Tag: v0.21~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eaced1dde0be5a5c02209e9c90818c36968e241;p=thirdparty%2Fgettext.git

build: Fix a warning (regression from 2020-01-05).

* gettext-tools/tests/tstgettext.c (setlocale): Declare after defining as
fake_setlocale.
* gettext-tools/tests/tstngettext.c (setlocale): Likewise.
* gettext-tools/tests/plural-1-prg.c (setlocale): Likewise.
* gettext-tools/tests/format-c-3-prg.c (setlocale): Likewise.
* gettext-tools/tests/format-c-4-prg.c (setlocale): Likewise.
---

diff --git a/gettext-tools/tests/format-c-3-prg.c b/gettext-tools/tests/format-c-3-prg.c
index f26e7a5cd..8cd47a4de 100644
--- a/gettext-tools/tests/format-c-3-prg.c
+++ b/gettext-tools/tests/format-c-3-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the format-c-3 test.
-   Copyright (C) 2002, 2009, 2013, 2018 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009, 2013, 2018, 2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@
 #undef setlocale
 #if defined _WIN32 && !defined __CYGWIN__
 # define setlocale fake_setlocale
+extern char *setlocale (int category, SETLOCALE_CONST char *locale);
 #endif
 
 #define _(string) gettext (string)
diff --git a/gettext-tools/tests/format-c-4-prg.c b/gettext-tools/tests/format-c-4-prg.c
index 5160ff6ef..84ed4f9c3 100644
--- a/gettext-tools/tests/format-c-4-prg.c
+++ b/gettext-tools/tests/format-c-4-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the format-c-4 test.
-   Copyright (C) 2002, 2009, 2013, 2018 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009, 2013, 2018, 2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@
 #undef setlocale
 #if defined _WIN32 && !defined __CYGWIN__
 # define setlocale fake_setlocale
+extern char *setlocale (int category, SETLOCALE_CONST char *locale);
 #endif
 
 #define _(string) gettext (string)
diff --git a/gettext-tools/tests/plural-1-prg.c b/gettext-tools/tests/plural-1-prg.c
index e681595b5..0df74d240 100644
--- a/gettext-tools/tests/plural-1-prg.c
+++ b/gettext-tools/tests/plural-1-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the plural-1 test.
-   Copyright (C) 2001-2002, 2009, 2013, 2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2009, 2013, 2018, 2020 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@
 #undef setlocale
 #if defined _WIN32 && !defined __CYGWIN__
 # define setlocale fake_setlocale
+extern char *setlocale (int category, SETLOCALE_CONST char *locale);
 #endif
 
 int
diff --git a/gettext-tools/tests/tstgettext.c b/gettext-tools/tests/tstgettext.c
index d3f44ff9c..8845ce090 100644
--- a/gettext-tools/tests/tstgettext.c
+++ b/gettext-tools/tests/tstgettext.c
@@ -1,5 +1,5 @@
 /* gettext - retrieve text string from message catalog and print it.
-   Copyright (C) 1995-1997, 2000-2007, 2012, 2018-2019 Free Software
+   Copyright (C) 1995-1997, 2000-2007, 2012, 2018-2020 Free Software
    Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, May 1995.
 
@@ -44,6 +44,7 @@
 #if defined _WIN32 && !defined __CYGWIN__
 # undef setlocale
 # define setlocale fake_setlocale
+extern char *setlocale (int category, SETLOCALE_CONST char *locale);
 #endif
 
 #define _(str) gettext (str)
diff --git a/gettext-tools/tests/tstngettext.c b/gettext-tools/tests/tstngettext.c
index 42865aee7..9b253aaf4 100644
--- a/gettext-tools/tests/tstngettext.c
+++ b/gettext-tools/tests/tstngettext.c
@@ -1,5 +1,5 @@
 /* ngettext - retrieve plural form strings from message catalog and print them.
-   Copyright (C) 1995-1997, 2000-2007, 2012, 2018-2019 Free Software
+   Copyright (C) 1995-1997, 2000-2007, 2012, 2018-2020 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -41,6 +41,7 @@
 #if defined _WIN32 && !defined __CYGWIN__
 # undef setlocale
 # define setlocale fake_setlocale
+extern char *setlocale (int category, SETLOCALE_CONST char *locale);
 #endif
 
 #define _(str) gettext (str)