From 15142f279769f4eea233a0d73a3afc74db0e6082 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 15 Apr 2012 17:41:01 -0700
Subject: [PATCH] Assume less-ancient POSIX support.

* update-game-score.c: Include <getopt.h> rather than rolling our
own decls for optarg, optind, opterr.  See
<http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html>.
---
 lib-src/ChangeLog           | 7 +++++++
 lib-src/update-game-score.c | 5 +----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index ac3e0a612e..ea5f5a2662 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Assume less-ancient POSIX support.
+	* update-game-score.c: Include <getopt.h> rather than rolling our
+	own decls for optarg, optind, opterr.  See
+	<http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00720.html>.
+
 2012-04-14  Juanma Barranquero  <lekktu@gmail.com>
 
 	* emacsclient.c (decode_options) [WINDOWSNT]:
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index a32bd6d8d7..e0c940510b 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -46,10 +46,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <fcntl.h>
 #endif
 #include <sys/stat.h>
-
-/* Needed for SunOS4, for instance.  */
-extern char *optarg;
-extern int optind, opterr;
+#include <getopt.h>
 
 static int usage (int err) NO_RETURN;
 
-- 
2.20.1