[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gnulib-bug
Subject:    Re: getopt _getopt_internal declaration clash on Solaris 5.10
From:       Paul Eggert <eggert () cs ! ucla ! edu>
Date:       2017-04-29 18:11:29
Message-ID: 7ae6fbda-3097-2bb2-f6dc-df3661bdd111 () cs ! ucla ! edu
[Download RAW message or body]

Thanks for the heads-up. I installed the attached Gnulib patch, which I hope fix 
things. Please give it a try.

["0001-getopt-port-to-Solaris-10-with-circa-1997-glibc-geto.patch" (text/x-diff)]

From f3f95f863f63eec80bfe4228719fb0afada5fa05 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 29 Apr 2017 11:09:39 -0700
Subject: [PATCH] getopt: port to Solaris 10 with circa-1997 glibc getopt.h

Problem reported by Assaf Gordon and Gavin Smith in:
http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00157.html
* lib/getopt-pfx-ext.h (_getopt_internal) [__GETOPT_PREFIX]:
#define this, too.
---
 ChangeLog            | 8 ++++++++
 lib/getopt-pfx-ext.h | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d641fb7..5640abe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2017-04-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+	getopt: port to Solaris 10 with circa-1997 glibc getopt.h
+	Problem reported by Assaf Gordon and Gavin Smith in:
+	http://lists.gnu.org/archive/html/bug-gnulib/2017-04/msg00157.html
+	* lib/getopt-pfx-ext.h (_getopt_internal) [__GETOPT_PREFIX]:
+	#define this, too.
+
 2017-04-29  Bruno Haible  <bruno@clisp.org>
 
 	strerror_r-posix: Fixes for MSVC 14.
diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h
index 2f86b23..d960bb3 100644
--- a/lib/getopt-pfx-ext.h
+++ b/lib/getopt-pfx-ext.h
@@ -40,9 +40,11 @@
 # undef getopt_long
 # undef getopt_long_only
 # undef option
+# undef _getopt_internal
 # define getopt_long __GETOPT_ID (getopt_long)
 # define getopt_long_only __GETOPT_ID (getopt_long_only)
 # define option __GETOPT_ID (option)
+# define _getopt_internal __GETOPT_ID (getopt_internal)
 #endif
 
 /* Standalone applications get correct prototypes for getopt_long and
-- 
2.7.4



[prev in list] [next in list] [prev in thread] [next in thread]