getopt: avoid clash with FreeBSD _getopt_internal

* lib/getopt.in.h (_getopt_internal): Override the name.
* lib/getopt_int.h (includes): Pick up any overrides.
Reported by Reuben Thomas.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index e3b25c6fe5de9ad08ce410147e8bd909d0f9bc52..557655ea0eb2d71ce6325bf4b1c7f75a0bc211c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-10-05  Eric Blake  <ebb9@byu.net>
 
+       getopt: avoid clash with FreeBSD _getopt_internal
+       * lib/getopt.in.h (_getopt_internal): Override the name.
+       * lib/getopt_int.h (includes): Pick up any overrides.
+       Reported by Reuben Thomas.
+
        hash: allow C89 compilation
        * lib/hash.c (check_tuning): Move declaration before statement.
        Reported by Reuben Thomas.

diff --git a/lib/getopt.in.h b/lib/getopt.in.h
index 15c213f79b3b90a651d434a016bc1995b9ea7714..9de467ae98cbc76fb3c6449e4a5669ae303c721b 100644 (file)
--- a/lib/getopt.in.h
+++ b/lib/getopt.in.h
@@ -68,6 +68,7 @@
 # define optind __GETOPT_ID (optind)
 # define optopt __GETOPT_ID (optopt)
 # define option __GETOPT_ID (option)
+# define _getopt_internal __GETOPT_ID (getopt_internal)
 #endif
 
 /* Standalone applications get correct prototypes for getopt_long and

diff --git a/lib/getopt_int.h b/lib/getopt_int.h
index 3c6628bb94a920215a25a562b9c5b408c30b9cf7..69cdf0de49b559aa606aced69f94fe1c90c0ecdb 100644 (file)
--- a/lib/getopt_int.h
+++ b/lib/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
+   Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009
    Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -19,6 +19,8 @@
 #ifndef _GETOPT_INT_H
 #define _GETOPT_INT_H  1
 
+#include <getopt.h>
+
 extern int _getopt_internal (int ___argc, char **___argv,
                             const char *__shortopts,
                             const struct option *__longopts, int *__longind,