diff options
author | Karl Berry <karl@freefriends.org> | 2012-04-13 18:07:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-04-13 18:07:41 +0000 |
commit | 37c57a12e33bf805597404f446a7f78f8554b25f (patch) | |
tree | d8052e1712e301eaa08582aa4c3af3c716abc6db /Build/source/utils/chktex | |
parent | 9b94ca61d062dbd9a912b838d5d8be32de8df2bd (diff) |
consistency
git-svn-id: svn://tug.org/texlive/trunk@25948 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/chktex')
-rw-r--r-- | Build/source/utils/chktex/getopt.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Build/source/utils/chktex/getopt.h b/Build/source/utils/chktex/getopt.h index c899189bebc..a2530b8bf8f 100644 --- a/Build/source/utils/chktex/getopt.h +++ b/Build/source/utils/chktex/getopt.h @@ -120,8 +120,12 @@ struct option #if defined(__GNU_LIBRARY__) || defined (WIN32) || defined (__CYGWIN__) /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation - errors, only prototype getopt for the GNU C library. */ + errors, only prototype getopt for the GNU C library. And not when + compiling with C++; g++ 4.7.0 has introduced a conflicting + declaration. */ +#if !defined (__cplusplus) extern KPSEDLL int getopt (int argc, char *const *argv, const char *shortopts); +#endif #if defined (__MINGW32__) || defined (__CYGWIN__) #define __GETOPT_H__ /* Avoid that <unistd.h> redeclares the getopt API. */ #endif |