problem with getopt-gnu on solaris

[Jean-Louis Martineau]

Hi,

I updated my gnulib to git 841ad196dd3ca0fbc916b911449067417ac7a7cb and 
changed the getopt module to getopt-gnu.

I get error when compiling on Solaris 10:
"../gnulib/getopt.h", line 183: (struct) tag redeclared: option
"../gnulib/getopt.h", line 232: identifier redeclared: getopt_long
       current : function(int, pointer to const pointer to char, 
pointer to const char, pointer to const struct option {pointer to const 
char name, int has_arg, pointer to int flag, int val}, pointer to int) 
returning int
       previous: function(int, pointer to const pointer to char, 
pointer to const char, pointer to const struct option {pointer to char 
name, int has_arg, pointer to int flag, int val}, pointer to int) 
returning int : "/usr/include/getopt.h", line 50
"../gnulib/getopt.h", line 236: identifier redeclared: getopt_long_only
       current : function(int, pointer to const pointer to char, 
pointer to const char, pointer to const struct option {pointer to const 
char name, int has_arg, pointer to int flag, int val}, pointer to int) 
returning int
       previous: function(int, pointer to const pointer to char, 
pointer to const char, pointer to const struct option {pointer to char 
name, int has_arg, pointer to int flag, int val}, pointer to int) 
returning int : "/usr/include/getopt.h", line 52

/usr/include/getopt.h:
struct option {
       char *name;     /* name of long option */
       int has_arg;    /* whether option takes an argument */
       int *flag;      /* if not NULL, set *flag to val when option 
found */
       int val;        /* if flag is not NULL, value to set *flag to. */
                       /* if flag is NULL, return value */
};


config/config.h:
#define GNULIB_GETOPT_GNU 1
#define HAVE_GETOPT 1
#define HAVE_GETOPT_DECL 1
#define HAVE_GETOPT_H 1
#define HAVE_GETOPT_LONG_ONLY 1
#define __GETOPT_PREFIX rpl_


$ cat /etc/release
                      Solaris 10 5/08 s10s_u5wos_10 SPARC
          Copyright 2008 Sun Microsystems, Inc.  All Rights Reserved.
                       Use is subject to license terms.
                            Assembled 24 March 2008

Any help is appreciated.

Jean-Louis