summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-05-27 16:52:22 +0000
committerKarl Berry <karl@freefriends.org>2010-05-27 16:52:22 +0000
commit3cfa6e6c975e08ec4a2fa814a5ae5cbbf788fa4f (patch)
tree5c40ed8b89726abc97c175c2fc6161dd1759b47d /Build
parent91faf4aff12ed61f8d3eebcb226dd4600a86b8dc (diff)
remove non-prototyped getopt() declaration, vvv
git-svn-id: svn://tug.org/texlive/trunk@18529 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/getopt.h4
2 files changed, 6 insertions, 4 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 5c929962f95..f7ef79c35aa 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-27 Karl Berry <karl@tug.org>
+
+ * getopt.h (getopt) [!__GNU_LIBRARY__]: do not declare at all.
+ Previous conditional on __cplusplus did not work with Sun CC.
+ Maybe all systems we compile on have getopt now? We'll see.
+
2010-05-25 Karl Berry <karl@tug.org>
* texmf.cnf (shell_escape_commands): include fc-list for
diff --git a/Build/source/texk/kpathsea/getopt.h b/Build/source/texk/kpathsea/getopt.h
index 945ea7775f3..a1e39724a90 100644
--- a/Build/source/texk/kpathsea/getopt.h
+++ b/Build/source/texk/kpathsea/getopt.h
@@ -116,10 +116,6 @@ struct option
differences in the consts, in stdlib.h. To avoid compilation
errors, only prototype getopt for the GNU C library. */
extern KPSEDLL int getopt (int argc, char *const *argv, const char *shortopts);
-#else /* not __GNU_LIBRARY__ */
-#ifndef __cplusplus
-extern KPSEDLL int getopt ();
-#endif /* not __cplusplus */
#endif /* __GNU_LIBRARY__ */
extern KPSEDLL int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);