Update copyright notice

[empserver] / src / lib / gen / plur.c

diff --git a/src/lib/gen/plur.c b/src/lib/gen/plur.c
index 805b648430839897663e0ef26316c8ba6b6b5896..27c6c0d1eb8548201d3e201a3f09a3b58530a0d9 100644 (file)
--- a/src/lib/gen/plur.c
+++ b/src/lib/gen/plur.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,46 +14,40 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  plur.c: Pluralize (is that a word?) something
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
-#include "misc.h"
-#include "gen.h"
+#include <config.h>
 
-s_char *
-plur(int n, s_char *no, s_char *yes)
-{
-    return (n == 1 ? no : yes);
-}
+#include "prototypes.h"
 
-s_char *
+char *
 splur(int n)
 {
-    return (n == 1 ? "" : "s");
+    return n == 1 ? "" : "s";
 }
 
-s_char *
+char *
 esplur(int n)
 {
-    return (n == 1 ? "" : "es");
+    return n == 1 ? "" : "es";
 }
 
-s_char *
+char *
 iesplur(int n)
 {
-    return (n == 1 ? "y" : "ies");
+    return n == 1 ? "y" : "ies";
 }