Merge from trunk.

2 files changed, 9 insertions, 5 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 99df8d949d5..55e76c0b008 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,10 +1,17 @@
-2012-04-14  Paul Eggert  <eggert@cs.ucla.edu>
+2012-04-16  Paul Eggert  <eggert@cs.ucla.edu>
 
         configure: new option --enable-gcc-warnings (Bug#11207)
         * Makefile.in (C_WARNINGS_SWITCH): Remove.
         (WARN_CFLAGS, WERROR_CFLAGS): New macros.
         (BASE_CFLAGS): Use new macros rather than old.
 
+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]:
         Call ttyname instead of passing its address (typo in 2011-12-04T17:13:01Z!lekktu@gmail.com).
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index a32bd6d8d78..e0c940510be 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;